am 21f08b7e: Merge "AArch64: Fixing and adding arm64 trampolines."

* commit '21f08b7ed0834f39737d9299799407133204a4ff':
  AArch64: Fixing and adding arm64 trampolines.