am c16fc5fc: am 09341a57: Merge "ART: Key-Value Store in Oat header"

* commit 'c16fc5fc1aa19fae40d48b03604610c1f59e34c0':
  ART: Key-Value Store in Oat header