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

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