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

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

Change-Id: Ib337ceaf33aa995f33f8f063a540242badb4fd04