Merge "x86-64: Fix art_quick_osr_stub for unwinder." am: 398daffb3e am: 469c98f89f
am: 5312095cf6

Change-Id: I8ceddeca3dbbe4113d42c7f4390210e6a17c0fbc