Merge "Fix braino in arm assembler."