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

Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551

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