Sync from Piper @473279986

PROTOBUF_SYNC_PIPER
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc
index 3848ade..03b8a4c 100644
--- a/conformance/conformance_test.cc
+++ b/conformance/conformance_test.cc
@@ -36,12 +36,12 @@
 #include <set>
 #include <string>
 
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/util/field_comparator.h>
-#include <google/protobuf/util/json_util.h>
-#include <google/protobuf/util/message_differencer.h>
+#include "google/protobuf/stubs/stringprintf.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/text_format.h"
+#include "google/protobuf/util/field_comparator.h"
+#include "google/protobuf/util/json_util.h"
+#include "google/protobuf/util/message_differencer.h"
 #include "conformance/conformance.pb.h"
 
 using conformance::ConformanceRequest;