resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp
resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp

Change-Id: I5573d097d741f4922b791b33de5c941af08127c6

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