Android 4.2 CTS release 2
Merge remote-tracking branch 'goog/ics-aah'