Move to dalvik.vm.lib.2 to force default to libart

Bug: 14298175

(cherry picked from commit 483f59ab9fb4b2d8ab212f77a50eed0528beca58)

Change-Id: I387af6e4721840f98063f26854c02e6da26b9974
Merge "Move to dalvik.vm.lib.2 to force default to libart"
auto-merger: merge in from aosp/master