resolved conflicts for merge of bfd6805a to master
resolved conflicts for merge of bfd6805a to master

Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45

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