[golang-googlecode-go-exp/f21] Extend import paths for golang.org/x/ - related: #1148481