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

This reverts commit e2a8da26833be50489a82fed87d0896bd3496709.

Reason for revert: broke build. 

Change-Id: I951cc070adbbbd784aa4f8e171e543c35d0249de
2 files changed