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

Change-Id: I765a59826d058867abe8dd7a851ed06936fd4321