resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp
resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp

Change-Id: I5cb6aeb5dd250aeba059feb1c70c13ac4745db3b

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