Merge "Disassemble Thumb2 shifts and more VFP instructions."