Merge "Revert "Reject classes inheriting from themselves directly or transitively."" into nyc-dev
am: cd38fb2099

* commit 'cd38fb20995d8fa7fc6979335d038d7eaac24745':
  Revert "Reject classes inheriting from themselves directly or transitively."

Change-Id: I6696ac6463c94b317b0696d94f1c23bed901b639