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

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