fix bad merge conflict resolution
fix bad merge conflict resolution

Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build