Merge "trusty: Update TIPC UAPI header"