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

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