am f063d9e9: am 46d87021: Merge "Fix moving GC bugs in proxy stub for X86/X86_64"

* commit 'f063d9e968d892e740cbb20b88fa4e05b1b03eda':
  Fix moving GC bugs in proxy stub for X86/X86_64