[golang-googlecode-net/f21] Extend import paths for golang.org/x/ - related: #1009967