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

Change-Id: I339d1a5507f6e01a93b509684bc2259668037806