resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40
resolve merge conflicts of 12db224 to lmp-mr1-dev
am: 0c672afc40

Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45

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