Merge "ART: Change no-dex2oat test configuration"