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