Sync with go.tools revision 157 or so