Merge "Move more test code to CommonArtTest"
am: 267c835298

Change-Id: I1e71ba65da23ea584223e73b5cd41a34bbcbbe8b