am 412e7ee1: am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"
am 412e7ee1: am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"

* commit '412e7ee1f9370b35c68f982e922e6f5e7bd38190':
  Allow USE_GOMA=true without explicit USE_NINJA=true

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