Merge "Add com.android.virt"