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

Change-Id: I9b736f59479d756e2999b1e3cf5c27b1907a00ca