Sync from Piper @467099277

PROTOBUF_SYNC_PIPER

conformance/conformance_cpp.cc

diff --git a/conformance/conformance_cpp.cc b/conformance/conformance_cpp.cc
index dd753ca..85fa9d0 100644
--- a/conformance/conformance_cpp.cc
+++ b/conformance/conformance_cpp.cc
@@ -44,8 +44,8 @@
 #include <google/protobuf/util/type_resolver_util.h>
 #include <google/protobuf/stubs/status.h>
 #include <google/protobuf/stubs/statusor.h>
-#include "conformance.pb.h"
-#include "conformance.pb.h"
+#include "conformance/conformance.pb.h"
+#include "conformance/conformance.pb.h"
 #include <google/protobuf/test_messages_proto2.pb.h>
 #include <google/protobuf/test_messages_proto3.pb.h>
 #include <google/protobuf/test_messages_proto3.pb.h>