Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build"
am: a50961ae95

* commit 'a50961ae9517cdaab83294e537f35922717e17f9':
  Use GOMA_HERMETIC=error for USE_GOMA=true build