Android 4.1 preview 2
Merge branch 'upstream'