Merge tag 'android-4.2.2_r1' into jb-mr1

Android 4.2.2 release 1