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

Change-Id: Ibed8048b85e2c287fdbe0a545986d57400ef42c6