Merge "Set correct builder for ccsdk-oran Sonar job"