Merge "Use libapexsupport only for apex variants" into main