use new golang.org/x/... subrepo naming (see https://docs.google.com/document/d/1VdB_ecg6wTBC-iRzAT-eCwvzj0rlRw7iL5KRdzGtlu4/edit)