Merge "Fix ordering of checks based on llvm-readobj output."