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

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