Fix bad dependency chains and imports

Bug: 68410
Change-Id: I80e91b9c7db18a1fb16e66f0834788bda7cbf742