resolved conflicts for merge of b3ce4b1b to master
resolved conflicts for merge of b3ce4b1b to master

Change-Id: I7f9abc0eb75f7c7042037e73c8fdb67025a2ee2a

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