Merge "Fix art_quick_instrumentation_entry for x86"