resolve merge conflicts of 2ad8b97577 to nyc-dev
resolve merge conflicts of 2ad8b97577 to nyc-dev

Change-Id: Ifa7501e58dd25e73ed760b1383a1873e4d449885

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