am a183e1ae: am 6bcc8378: am c435e014: Merge "ART: Duplicate-classes cleanup"

* commit 'a183e1aed9ba7abcf79e741841c414d9abe7c5ec':
  ART: Duplicate-classes cleanup