am 0965ce8f: am 6e655afb: Merge "ART: Check for duplicate classes when loading oat files"

* commit '0965ce8fa35b487bbf36bbfb7bed795e9547f647':
  ART: Check for duplicate classes when loading oat files