resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev
resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev

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