Unbreak llvm-arm-linux buildbot and fix PR5309.