Fix build breakages with gcc 4.7.  It doesn't like '<::'.

"<::" -> "< ::"

Change-Id: Ie83b0e6c09972b175ce72e37d20b5122a16e922b