Android 4.2 preview 1.1
Merge branch 'upstream'