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

Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c

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