Merge "Enable D8 for ART tests already working with D8."
am: 22bd3c9695

Change-Id: Ia153f9e9ea0ee88db2586d17d7db2e24b859f81e