Temp. Revert "Merge tag 'android-4.3.1_r1' of https://android.googlesource.com/platform/build into HEAD"

This reverts commit 6b42dce37657bc8211daa6ddb449effeced8a316, reversing
changes made to a0f807cc7ce447a37cfa63cd448adad408fe1e5e.