Revert "Merge tag 'android-4.2.2_r1' into jellybean"

This reverts commit 117440e9c43aa42ab019e78a72ca30bcb4cb31ac.