Merge "Revert "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"""
am: ec178ee584

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