Merge "Add libz to static libs of libutils_test" into main