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