merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Merge tag 'android-4.2.2_r1' into HEAD

Android 4.2.2 release 1