Merge tag 'android-4.2.2_r1.2'

Android 4.2.2 release 1.2

Change-Id: Ic19ff164b810e2e0b45fae3efaa13b05484099b9