am 53b36a26: Merge "Handle variable size of methods properly between 32 and 64 bit."

* commit '53b36a26925e898b5f7cd3fad1d6a133eda62b4b':
  Handle variable size of methods properly between 32 and 64 bit.