Get rid of some build warnings.

@pherl