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

* commit 'afe220464222e93514d1048a9361bb46aafd4905':
  Rename some instructions to compile with llvm and gas.