Merge "Make librkpd_client available to com.android.virt" into main