am 86af9e0f: am e89517d4: am c16fc5fc: am 09341a57: Merge "ART: Key-Value Store in Oat header"

* commit '86af9e0f9d0285a393e9ef08aa698f915d96f48c':