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

Change-Id: I8a5a87a46b788409c41bba5662ff968fda1c6e9e