am a15fc8fd: am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit 'a15fc8fd1aad30631b7605f3120bdee3b8cf2ba4':
  build: Rename persist.sys.dalvik.vm.lib to allow new default