Merge "Clean up ArtClassDefinition"
am: 5b92c48f99

Change-Id: I6a993f84a133c1157364a106f8736b0a10623435