Merge "ART: Change no-dex2oat test configuration"
am: 37d164f30d

Change-Id: I53ee8e1e4aee071a5e271b2fbb6209cc9dd3324c