Revert^2 "Fix build error on test_suites_x86_64-next target"

This reverts commit 5d1557a89684d0fd22cace63ea6ca9c1174272d1.

Reason for revert: build fails on test_suites_arm b/424394123

Bug: b/424394123
Bug: b/418868405 Bug: b/412560144
Change-Id: I744bd0bec15319828091a072e2fd847d96d52360
3 files changed