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

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