resolved conflicts for merge of 34cb6460 to master
resolved conflicts for merge of 34cb6460 to master

Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea

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