Fix gcc-4.6 warnings.

Change-Id: I62cfb8b1a39499366ee18c1904e6991567f78571
3 files changed