Merge "Fix art_quick_osr_stub signature."
am: cff125396f

Change-Id: I596999266604dfe8bbff14e7ee343d1924bc6236