Merge "Change art-test build module names and dirs"