am 39c7d243: Merge "Use goma when USE_GOMA=true is set"

* commit '39c7d243395ad3f2015571aaf902dc4d4686e981':
  Use goma when USE_GOMA=true is set