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

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