am 60181e36: Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit '60181e360e1c6240d70a3b365b78f8ff28b31493':
  frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default