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

Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1

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