am 3a9a2089: am e6411e68: Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev

* commit '3a9a2089852d18ef7abbb9476fc3455bfec5a880':
  Set persist.sys.dalvik.vm.lib at system server startup