Both automated updates with a few tweaks.

Change-Id: I24579a8dcc32a84a4fff5c2212681ef30dda61d1
Reviewed-on: https://go-review.googlesource.com/33297Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>