Various fixes to allow non-LLVM version of new cheritest-helper tests to
compile.