This reverts commit 0b4d05e0. Test: m test-art-host-run-test Change-Id: Ie946ebd899002bdc7502276b3d53000c551be768