am 4b69be27: (-s ours) am c816e061: Merge "(DO NOT MERGE) Revert "Make libart...
am 4b69be27: (-s ours) am c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
* commit '4b69be27':
(DO NOT MERGE) Revert "Make libart the default runtime"