Merge "Revert "Move ART tests to use D8.""
am: db9f630e23

Change-Id: Ibe803870866987bdff45a91d8a50b381f828fe0e