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

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