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

* commit 'ccc30874e69ed7dd44b457ad2c6a8173e5123631':