Merge "Do not use clang lld for oatdump tests"