Revert "Trimmed the branch to only the ndt_map_builder sub directory"

This reverts commit b505aaaf63dbbc1000f2aeae092e64218e79cd22.
Rebase from 'upstream'
Trimmed the branch to only the ndt_map_builder sub directory