This reverts commit f909669f. Reason for revert: breeaks build aosp-master on test_suites_x86_64 Change-Id: I5ce549e338eb59070af815a7ff370659ae4b55dc Bug: 271252145