Snap for 11507696 from 136628263d5783c292cbc72486987778fa251f6c to mainline-cellbroadcast-release

Change-Id: I11060fb8c886a5108316cf1b146cf7d9f93d93dd
diff --git a/src/crypto/x509v3/v3_utl.c b/src/crypto/x509v3/v3_utl.c
index bbc82e2..13c981f 100644
--- a/src/crypto/x509v3/v3_utl.c
+++ b/src/crypto/x509v3/v3_utl.c
@@ -398,8 +398,12 @@
           state = HDR_NAME;
           *p = 0;
           vtmp = strip_spaces(q);
-#if 0
-                printf("%s\n", ntmp);
+          // Workaround for Clang code coverage profile merging issues (see
+          // b/303264725).
+#if defined(__ANDROID_CLANG_COVERAGE__)
+              for (int i = 0; i < state; i ++)
+                printf("Coverage_test: %s\n",
+                       (ntmp == NULL ? "(NULL)" : ntmp));
 #endif
           if (!vtmp) {
             OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_NULL_VALUE);