Merge "build/make/core: Fix fragile assumptions about build toolchain." am: b371c7756a
am: 68587c24a9

Change-Id: Ib3fe9425e7aefb0a2f5f8c7aa91d135cfa464e18