Android 4.1.1 release 4
Merge branch 'upstream'