Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"