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

Change-Id: Ie3c3599dfc2e193e8772bdcc85875946330fe17f