Revert "Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/build into jb-devel-mr2-release"

This reverts commit 76ef4e8dfe0ff0abfde6fefa44ef034d62721113, reversing
changes made to 94df553bcf056f4d89902d58248544f1d0495fb6.