Merge "Avoid duplicated definition in llndk-versioning.h" into main