Merge "Optimize rebuilds by reducing $(shell) usage" am: f009531772 am: 466f4f2b9e
am: c1aff754c4

Change-Id: I0f20752358facf3f41ce690c37f5696928ab5342