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

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