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

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