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