Merge \"Ensure we still build the hw layers when pulling up all apps.\" into ub-launcher3-calgary
am: 76acffce3d

Change-Id: I8cdfa328dc767f783a4397679cacbd38aaacac60