Bug: 63467744 Test: test-art-host This reverts commit 6921d90a. Change-Id: If70e31d3a15579dc75fd40bfef186e0124568c87