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

* commit '6b37c7b32af667f6a42b397a27add34d3c59e5fa':
  Allow USE_GOMA=true without explicit USE_NINJA=true

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