Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"" am: bc90a0538e
am: 6e4753f0bc  -s ours

* commit '6e4753f0bc55655e2e178cb16d6a232ebd055543':
  Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"