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

Change-Id: I22bb2d5b3ec1a217e109ee3e0de8bcf8763a2b6e