Android 4.1.1 release 5
Reconcile AOSP and GOOG jb-release

Change-Id: I2899cb5c4e8e5ff209a0657f783ef179e61c7798