am 2980e3c3: am 045a95cf: Merge "Fix braino in arm assembler."

* commit '2980e3c335d65773e760a26c80834f7ed3a21255':
  Fix braino in arm assembler.