Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev