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

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