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

Change-Id: I8d0b0310ef8fcf20f33ba788af3c6ab2eb8793c5