resolved conflicts for a1fcaf86 to mnc-dr-dev
resolved conflicts for a1fcaf86 to mnc-dr-dev

Change-Id: Ie53652faa530a3c9c83f30c8f2b636d90f0f1b7a

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