Merge "Thumb2: Clean up 16-bit LDR/STR detection."