Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware...