Fix method id merging

There was a confusion betwwen JMethodId and JMethodWide that was causing
JMethods to be assigned to the wrong JMethodId. This was causing Jack to
emit methods with the wrong return type.

Bug: 27559958
Change-Id: Ibaf4e1b7d0c8c6f717cb5cc16b313df2befb8666
2 files changed