Fix build for GCC 4.7

Change-Id: I4e9265369174d82b55fd435bc47887972f99c9d4
Merge "Fix build for GCC 4.7" into du44