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