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

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