go.tools/oracle: restore edits lost in rev aa9b649bccd9 (botched merge)
go.tools/oracle: restore edits lost in rev aa9b649bccd9 (botched merge)

R=crawshaw
TBR=crawshaw
CC=golang-dev
https://golang.org/cl/13604044

jdhenke/tools,argandas/tools,cw2018/tools,springning/tools,matryer/tools,4ad/tools,syreclabs/go-tools,jdhenke/tools,argandas/tools,syreclabs/go-tools,sshetty10/tools,nicot/tools,springning/tools,nicot/tools,golang/tools,springning/tools,maddyonline/tools,magiccao/tools,matryer/tools,argandas/tools,nicot/tools,cw2018/tools,magiccao/tools,sshetty10/tools,maddyonline/tools,glasser/golang-tools,argandas/tools,nicot/tools,jdhenke/tools,josharian/tools,syreclabs/go-tools,syreclabs/go-tools,glasser/golang-tools,cw2018/tools,golang/tools,magiccao/tools,josharian/tools,cmars/tools,matryer/tools,dmitris/tools,magiccao/tools,josharian/tools,golang/tools,4ad/tools,cmars/tools,sshetty10/tools,dmitris/tools,matryer/tools,springning/tools,glasser/golang-tools,cw2018/tools,syreclabs/go-tools,golang/tools,runcom/tools,sshetty10/tools,josharian/tools,4ad/tools,runcom/tools,dmitris/tools,maddyonline/tools,golang/tools,runcom/tools,runcom/tools,maddyonline/tools,glasser/golang-tools,cmars/tools,syreclabs/go-tools,cmars/tools,jdhenke/tools,dmitris/tools