Build on GCC 4.7

Change-Id: Ib35c66da720051908e7e957837d10a9be8c744ff