Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev