Merge "Fix Thumb2 assembler to emit 16-bit add/sub SP, #imm."