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

Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747

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