resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp
resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp

Change-Id: I2e09a3845d48bc52eca49cb7913f85960e0d9db8

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