Merge "x86_64: Fix stubs after 4-byte method handler"