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

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