Merge "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
am: 7d5a577c1f

* commit '7d5a577c1f256a7703361afb071dcd4ecc7d275f':
  Combine direct_methods_ and virtual_methods_ fields of mirror::Class