Android 4.1.1 release 2
Merge branch 'upstream'