Merge "Revert "ART: Simple structural class check""
am: e5d54059ae

Change-Id: I6073b00edb1b0b2256ab0e6ac6ab50f20830fea2