Use new golang.org/x/... import paths.

See http://golang.org/s/go14subrepo.
Trim (unnecessary) trailing whitespace.