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

* commit 'e89517d4c3678aad3b8909cb75d2d6ffa2678885':