Merge "Catch classes that inherit from themselves in dexmerger." am: ef028e72c1
am: b263f358ba

* commit 'b263f358bae61dc0b8433b4c87c0af2b0920d8a3':
  Catch classes that inherit from themselves in dexmerger.

Change-Id: I5060b1408b5b4ce0389b62da3a1e79a940a0eed3