Android 4.1.1 release 3
Merge branch 'upstream'