Merge "Combine direct_methods_ and virtual_methods_ fields of mirror::Class" am: 7d5a577c1f
am: 20aeec4a7a  -s ours

* commit '20aeec4a7aeb1d249e07db8e5067a4c62ab7956d':
  Combine direct_methods_ and virtual_methods_ fields of mirror::Class