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

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