Revert "Merge tag 'android-4.3_r3.1' into HEAD"

This reverts commit 325d884f6fa24643da7c321eeefb6cb8181c749e.

Conflicts:
	core/build_id.mk