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

Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce

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