Revert "am 2e0d1af7: Merge changes I58d43128,Ie34c958f"

This reverts commit 37868329b29ae7c2399860aee1fcf30f6ebd3fa6, reversing
changes made to 165c67aacd8c6e8e6ffe57e673602952e4b56219.

Conflicts:
	core/Makefile
	target/product/core.mk