Merge \"ART: Fix run-test script\"
am: 64a73d790d

Change-Id: I9dd051ba4a63c536a1a45ac7a30bc80cd380f5ff