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

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