Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev