Merge "Revert "DO NOT MERGE ART: Turn off duplicate-classes checking"" into mnc-dev