More build problems on ARM.

This problem should now be resolved on the latest master.