Android 4.2.2 release 1.1
Merge branch 'upstream'