resolved conflicts for merge of 9c7281fb to master
resolved conflicts for merge of 9c7281fb to master

Change-Id: Ibbcb5cdc46d6d7e1a5bf12d090717f11b26b7308

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