Merge "Delay emitting CFI PC adjustments until after Thumb2/Mips fixup."
am: c8894ab502

* commit 'c8894ab5021aecd0fa5eba94af47f732914af33b':
  Delay emitting CFI PC adjustments until after Thumb2/Mips fixup.