Fix build with gcc 4.8+

Change-Id: I1d7f98dc60a9526e8fa76ec932f10ff609f8f88d