Merge "Change art-test build module name"
am: c21f694984

Change-Id: I1bc85c772554d9dca6fe0a00d89ffc9412d410af