Merge "x86/x86-64: Fix art_quick_instrumentation_exit CFI."