merge from open-source master
merge from open-source master

Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base