s3-srvsvc-idl: merge STR_LEN4 removal from s4.