Also remove second email address from AUTHORS file
in a few cases.  It only has a meaning in the CONTRIBUTORS file.

R=r, gri
CC=golang-dev
https://golang.org/cl/4022042