Merge "Sync tipc.h with one from trusty" into main