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

Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e

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