Android 4.1.2 release 2.1
Merge branch 'upstream'