resolved conflicts for merge of e04e91b1 to master
resolved conflicts for merge of e04e91b1 to master

Change-Id: I537065b0810ea8525401778824c4810c5e7ef433

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