Revert "Merge tag 'android-4.3_r2.1' into cm-10.2"

This reverts commit 4f6ae3a7e53346a110ee4e02ebbfed8909261d85, reversing
changes made to 4e9b00424f752067ad7a358159b14cb34b485e6f.