fix gcc 4.8 warnings

LGTM=rsc
R=rsc
https://codereview.appspot.com/33240044
6 files changed