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

* commit '6bcc83784f3ed50644f8c0ff270b7bb71eed7814':
  ART: Duplicate-classes cleanup