Merge "Update references to build/core to build/make/core" am: 6db8597174
am: bce301801f

Change-Id: Ia79b01150eea31e95eb40dddb0209d6ec12a1ff1