am d83d1a7e: Merge "Fix x86 instrumentation exit entrypoint and trace size limit."

* commit 'd83d1a7edf07c33336935faff918424b23247320':
  Fix x86 instrumentation exit entrypoint and trace size limit.