Revert "Clean and consolidate objects"

This reverts commit b745d8e6bd26715a49950ede260331d86581dd3e.

Reason for revert: Broken build https://android-build.corp.google.com/quarterdeck/?branch=git_main&target=husky-trunk-userdebug&lkgb=13919093&fkbb=13919226

Bug: 420960164
Change-Id: I16df8d63555b4afff59af6c91b1c3b9715c519af
20 files changed