Fix build w/ gcc 4.8

Change-Id: I360274b5833d334a421a333ca46ad428cad3bea7