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

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

Change-Id: I74a64b305d739a6dc75e46bd20db9f33e6e85d75