am: b263f358 * commit 'b263f358': Catch classes that inherit from themselves in dexmerger. Change-Id: I5060b1408b5b4ce0389b62da3a1e79a940a0eed3