Revert "Avoid duplicate classes in boot path."

This reverts commit efba4176d8923bde102903035c07c6a6e3388f49.

Reason for revert: DroidMonitor: Potential culprit for Bug b/310080905 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 310080905
Change-Id: Id7d6c1fbc6e58b08c14ad52b74a10adbff8abc4e
6 files changed