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

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