Merge "ART: Fix target run-tests to build architecture directories"