Merge "Remove BuildCompatUtils" into main