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

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