diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h
index dda9d1f4b9..5e03ef91d3 100644
--- a/talk/media/base/mediachannel.h
+++ b/talk/media/base/mediachannel.h
@@ -971,7 +971,7 @@ struct BandwidthEstimationInfo {
   // StatsOptions::include_received_propagation_stats is true.
   int total_received_propagation_delta_ms;
   std::vector<int> recent_received_propagation_delta_ms;
-  std::vector<int64> recent_received_packet_group_arrival_time_ms;
+  std::vector<int64_t> recent_received_packet_group_arrival_time_ms;
 };
 
 struct VoiceMediaInfo {
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 9d2fa6a0c1..157be6f9af 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -120,6 +120,10 @@ config("common_config") {
     }
   }
 
+  if (cpu_arch == "arm64") {
+    defines += [ "WEBRTC_ARCH_ARM" ]
+  }
+
   if (cpu_arch == "arm") {
     defines += [ "WEBRTC_ARCH_ARM" ]
     if (arm_version == 7) {
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 18b33830dd..33dbace9b0 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -250,6 +250,11 @@
           }],
         ],
       }],
+      ['target_arch=="arm64"', {
+        'defines': [
+          'WEBRTC_ARCH_ARM',
+        ],
+      }],
       ['target_arch=="arm" or target_arch=="armv7"', {
         'defines': [
           'WEBRTC_ARCH_ARM',