Minor simplification of gcimporter, removed TODO. R=adonovan CC=golang-dev https://golang.org/cl/7363044
