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