Merge "ART: Fix run-tests for emulator"