Android 4.2 preview 2.1
Merge branch 'upstream'