Remove C11ism

Change-Id: I093ef950f7097021dec3b829d4e11e7b20fc9292