Merge "Change art-test build module name"