Merge "Fix moving GC bugs in proxy stub for X86/X86_64"