Android 4.1 CTS release 2
Reconcile with AOSP

Change-Id: Ie9453a953131b58d303c567493915cb98b652a58