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

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