Merge "Define macros for LLNDK versioning" into main