Merge tag 'android-4.2.2_r1' into jb422

Android 4.2.2 release 1

Change-Id: I359a43df48fa60a13c267b6f9dc3fd062db3ecd4