Fix import path, and remove some unnecessary semicolons.

R=golang-dev, dave, adg
CC=golang-dev
https://golang.org/cl/6506068