am 6735d405: am 1b1ca21f: am 644fa22a: Merge "Fix instrumentation exit stub for arm64"

* commit '6735d4057048954112ac66dafdf65b23d707d011':
  Fix instrumentation exit stub for arm64