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

Change-Id: I4bd0fbc496ba8a3e2c0875248bca42aa9886e8b8