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

Change-Id: I30047e52224126c79313fc06424ee185760587bc