am c8fb7efa: am 8078b294: Merge "Revert "ART: Key-Value Store in Oat header""

* commit 'c8fb7efa2c6e284ae6e06841807458c857bbf32f':
  Revert "ART: Key-Value Store in Oat header"