resolved conflicts for merge of 610754e5 to cw-e-dev
resolved conflicts for merge of 610754e5 to cw-e-dev

Change-Id: Ia0d0d82c7fec86e1585a9e2c90ac877c363ed491

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