am 0ee33c32: Merge "Revert "Revert "ART: Key-Value Store in Oat header"""

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