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

Change-Id: I227bf1b5f1de8f858df72d58a4463aed5cc09cbc

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