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

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