Merge "Set soong config variables for cbd_v2" into main