Merge "Catch classes inheriting from themselves in the class linker." into nyc-dev
am: 3fdf31d101

* commit '3fdf31d101819d4e0200e80d1692ffcbe785af90':
  Catch classes inheriting from themselves in the class linker.

Change-Id: Ied64a7c6cd4eeb75eae59b46bd55a23720d44510