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

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