Android 4.1.1 release 4
Reconcile with AOSP

Change-Id: I1f05fb928172179924bec3bef83d0386a47436ed