resolved conflicts for merge of 177b05d6 to master
resolved conflicts for merge of 177b05d6 to master

Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364

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