This reverts commit 78985875. Bug: 33192586 Test: m test-art-host Test: m test-art-target Test: device boots Change-Id: I848b39a2b9b3c48beca2c68f9a316626a81abb39