am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp
am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

* commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838':
  Make the module existence check nonfatal

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