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

* commit '9e9eca25e406d997154f4efbbadaf5b361b0fa4c':
  Fix instrumentation exit stub for arm64