am cf3fb94a: Merge "Fix art_quick_instrumentation_entry for x86"

* commit 'cf3fb94a90d74361b13e7bae5aa6e0e4ae58479d':
  Fix art_quick_instrumentation_entry for x86