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

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