This reverts commit ce09f58360.
Reason for revert: will build break on run_host_tests
Bug: 130774632
Change-Id: Id2ee52ffb0689059da9cbdadd5bdae5b6a04a589
This reverts commit ce09f58360.
Reason for revert: will build break on run_host_tests
Bug: 130774632
Change-Id: Id2ee52ffb0689059da9cbdadd5bdae5b6a04a589