am 8a0607f0: (-s ours) am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set"

* commit '8a0607f0695b24d73d77c3915ebe29229f732079':