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

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