Merge "Revert "Combine directMethods and virtualMethods fields in Class.""
am: c86c851ff8

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