Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"