Merge "Optimize rebuilds by reducing $(shell) usage"