am 68448bb8: am 04538c1d: Merge "ART: Store classpath information into oat file"

* commit '68448bb81cefa0eb3b6e0b72d1442e8a1ec90d72':
  ART: Store classpath information into oat file