resolved conflicts for merge of 68000907 to lmp-mr1-dev
resolved conflicts for merge of 68000907 to lmp-mr1-dev

Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47

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