am e0dd0b85: am af3efe8c: Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit 'e0dd0b85145f4a9c004019feaeb9bc27ab98f9ad':
  frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default