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

Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6

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