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

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