am 7c2e3237: am 0b59c113: Merge "Fix ARM64 invoke stubs, correct CFI directives"

* commit '7c2e32376b2432859d2aa99904b9083d96fad763':
  Fix ARM64 invoke stubs, correct CFI directives