prior to cleanup. no changes, only moving. remove dependencies on strconv and strings R=r http://go/go-review/1017010