Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build"