Merge "Add Soong config variable for libgbm build variants" into main