Remove C11ism

Change-Id: Id5ae0cf42aa8d6ed464eb1149ebdd172a284a75f