Merge "Revert "Remove trusty-specific llndk-versioning.h."" into main