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

* commit 'e21bf0099117b82963cdf7f95a1b8dabfcf29397':
  x86_64: Fix stubs after 4-byte method handler