Android 4.1 CTS release 2
Merge branch 'upstream'