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

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