Fix a few compilation errors due to previous merge from tip.

Change-Id: I826ad5a9d602a8f8be2762ad00b030dea6f41bcc
Reviewed-on: https://go-review.googlesource.com/9967Reviewed-by: Alan Donovan <adonovan@google.com>