Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/native