This reverts commit 07ca2201. Reason for revert: b/293532332 - bionic unit tests failing Change-Id: I11412df55d7131ff0bb36dee7258b75a12024100