Clean up Class::GetDescriptor(). am: 3892e628ac
am: 8ce90cb9d4

Change-Id: Iec82b9e6fcfa703d404714455b2d5980f6fa1705