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

This reverts commit 012035738939cf35c9220cae93699af8112fd79e.