Fix arm-eabi builds

Change-Id: If9ccdf0ba85408eea61c32ecfbad049bf4b7dc94