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

This reverts commit e9cff9da7b02ffc0145d01db7ce309d5621636fd.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the ndt_map_builder sub directory