Merge "Replace libdvm reference with libart"