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

* commit '6aaba9c9e7d982a60b2dbf34cc11b704094d93cf':
  ART: Store classpath information into oat file