Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platfor...

...m/frameworks/av into 1.1

Android 4.2.2 release 1