Merge tag 'android-4.2.2_r1.2' into jellybean

Android 4.2.2 release 1.2