am 6af002b7: am b32a74c7: am ee1cdd0e: merge from open-source master
am 6af002b7: am b32a74c7: am ee1cdd0e: 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