Merge "Revert "Combine directMethods and virtualMethods fields in Class.""