am e88ae544: am b6f0cbdc: merge from open-source master
am e88ae544: am b6f0cbdc: merge from open-source master

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