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

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