Merge "Revert "Reorganize nonrtric builds""