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

Change-Id: Ib01b5c62c229817b6620692a8ae0211230813899

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