Merge "Catch classes that inherit from themselves in dexmerger."