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

* commit '2596abd85166880bc5b4613880aac5960fad2ef5':