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

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