Merge "Fix references to libcrypto_utils_static."