resolved conflicts for merge of eab5ab5d to mnc-dev-plus-aosp
resolved conflicts for merge of eab5ab5d to mnc-dev-plus-aosp

Change-Id: Ic7ba16887aa778fad6911a4bfb155e91b9b3c88e

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