Merge "Fix getGenericSuperclass."