Android 4.2.1 release 1
Merge branch 'upstream'