Merge "[trusty] Bump number of ACVP arguments to match boringssl"