Merge "Rename some instructions to compile with llvm and gas."