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

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