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

Change-Id: I28b8d2e5781180cecdcf4e8497e6806bbc7be9c6