Match build definitions to v3.18.1

Change-Id: I397554dbfbd1dc2e2c2c3651b94499815eff2945
diff --git a/BUILD.gn b/BUILD.gn
index ca87c9b..6a35b0d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -71,6 +71,7 @@
     "src/google/protobuf/generated_message_table_driven_lite.cc",
     "src/google/protobuf/generated_message_util.cc",
     "src/google/protobuf/implicit_weak_message.cc",
+    "src/google/protobuf/inlined_string_field.cc",
     "src/google/protobuf/io/coded_stream.cc",
     "src/google/protobuf/io/io_win32.cc",
     "src/google/protobuf/io/strtod.cc",
@@ -213,8 +214,8 @@
     "src/google/protobuf/dynamic_message.cc",
     "src/google/protobuf/empty.pb.cc",
     "src/google/protobuf/extension_set_heavy.cc",
-    "src/google/protobuf/field_access_listener.cc",
     "src/google/protobuf/field_mask.pb.cc",
+    "src/google/protobuf/generated_message_bases.cc",
     "src/google/protobuf/generated_message_reflection.cc",
     "src/google/protobuf/generated_message_table_driven.cc",