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

Change-Id: Ie7c5f660ffcd91288dc0294dce96e0b82a00f8b2