resolve merge conflicts of 0d00d28 to nyc-dev
resolve merge conflicts of 0d00d28 to nyc-dev

Change-Id: Ib922635fe200a4216ce2970660daf3105d521cc9

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