Remove leftovers. This reverts commit 84695aef. Bug: 32064548 Bug: 77288304 Test: m test-art-host Change-Id: I9b6f7f7daddd75ff47c7b17a91738858f0023605