Merge "Revert "Revert "x86: Fix art_quick_instrumentation_exit"""