Cherry-picked fix from #5406#5424

acozzette merged 1 commit intoprotocolbuffers:3.6.xprotocolbuffers/protobuf:3.6.xfrom

acozzette:mac-python-fixacozzette/protobuf:mac-python-fixCopy head branch name to clipboard