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

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