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

Change-Id: Icb4570f1fa71449dd96d76fb5b310197cad14ab5