Android 4.1.1 release 5
Merge branch 'upstream'