This reverts commit a73280df. Bug: 27185632 Bug: 74121887 Test: m test-art-host Change-Id: I24af48619577a78371c93cbad24d307d4d7a217d