Android 4.1.1 release 1
Merge branch 'upstream'