Merge "Revert "Combine directMethods and virtualMethods fields in Class."" am: c86c851ff8
am: e3c655dac0  -s ours

* commit 'e3c655dac018594afe3ee59463a49338c3bf3c64':
  Revert "Combine directMethods and virtualMethods fields in Class."