Android 4.2 CTS release 1
Merge branch 'upstream'