Merge "Quick: Use 16-bit conditional branch in Thumb2."