Merge "Clean up some logic skipping ValidateSuperClassDescriptors."
am: 951853a685

Change-Id: I001835ce8ca2e461753be232dcfe16c783c631da