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

Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b

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