Merge "r_submix: Fix compilation for non-default configurations"