Reverting because the CL broke multiple targets
(dependency issues), including aosp_taimen-userdebug,
aosp_arm64_ab-userdebug and build_test.
Bug: 70485693
This reverts commit d96b4296df33e905809f92848b7a87dde3d83916.
Change-Id: I8db728de00b0b9859d556d9f3fb2cdbb22ee4b60