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

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