Merge change 21178 into donut

* changes:
  Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.