Android 4.1.1 release 2
Reconcile with AOSP

Change-Id: I865436a73c05b6da5c03bb0f255e7256ca6079c7