am 529c147b: Merge "Fix instrumentation exit stub for arm64" into mnc-dev

* commit '529c147b6ce15fd4ac8b2500c7e7a5749e98396b':
  Fix instrumentation exit stub for arm64