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

* commit 'e45a3586e74f3e049e6542b394932c16f47fd0b5':