Merge "envsetup: Fix bash syntax error" into arcadia-next