am 5e821c7a: am c8fb7efa: am 8078b294: Merge "Revert "ART: Key-Value Store in Oat header""

* commit '5e821c7addd20dfb18c02f3ea76f940161e9848c':