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

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