Revert "Merge branch 'remove-git-submodule' into docker-ubuntu"

This reverts commit ac07eaafaf755cc594cb80081c9b2c9f81b22b44, reversing
changes made to d19a837c99974c20560961173f580122cad26a4d.