Jack Release 1.2-a21
Merge "Fix method id merging" into ub-jack