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

* commit '807781124612d192f5a8cd5fba646f4a051bcb45':