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

* commit '1b1ca21fcaff3cd124e3f7a134be5fee57217ba9':
  Fix instrumentation exit stub for arm64