Passes toolstash -cmp.

Change-Id: Ibb51ccaf29ee97c3463543175c9ac7b85ea10a7f
Reviewed-on: https://go-review.googlesource.com/37339Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>