Fix build problems with gcc-4.6.x.

Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
1 file changed