Merge "Change art-test build module names and dirs"
am: 00ca93af60

Change-Id: I3d668b48a59dc4d9277acbd68d41b3d1e844002f