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

Change-Id: Ie8aa9e1f528cb4a67398114b391ee5425e7c2cf7