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

Change-Id: I84238cbd9c16798837898929f387daeafd30ea28