diff --git a/Makefile.am b/Makefile.am
index 59788766..3072a473 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1417,6 +1417,7 @@ EXTRA_DIST = \
 	src/processor/testdata/microdump.stackwalk.machine_readable-arm.out \
 	src/processor/testdata/microdump-withcrashreason.dmp \
 	src/processor/testdata/microdump-x86.dmp \
+	src/processor/testdata/minidump_32bit_crash_addr.dmp \
 	src/processor/testdata/minidump2.dmp \
 	src/processor/testdata/minidump2.dump.out \
 	src/processor/testdata/minidump2.stackwalk.machine_readable.out \
@@ -1447,6 +1448,7 @@ EXTRA_DIST = \
 	src/processor/testdata/test_app.cc \
 	src/testing/googletest/include/gtest/gtest.h \
 	src/testing/googletest/include/gtest/gtest-death-test.h \
+	src/testing/googletest/include/gtest/gtest-matchers.h \
 	src/testing/googletest/include/gtest/gtest-message.h \
 	src/testing/googletest/include/gtest/gtest-param-test.h \
 	src/testing/googletest/include/gtest/gtest-printers.h \
@@ -1461,18 +1463,17 @@ EXTRA_DIST = \
 	src/testing/googletest/include/gtest/internal/gtest-death-test-internal.h \
 	src/testing/googletest/include/gtest/internal/gtest-filepath.h \
 	src/testing/googletest/include/gtest/internal/gtest-internal.h \
-	src/testing/googletest/include/gtest/internal/gtest-linked_ptr.h \
 	src/testing/googletest/include/gtest/internal/gtest-param-util-generated.h \
 	src/testing/googletest/include/gtest/internal/gtest-param-util.h \
 	src/testing/googletest/include/gtest/internal/gtest-port-arch.h \
 	src/testing/googletest/include/gtest/internal/gtest-port.h \
 	src/testing/googletest/include/gtest/internal/gtest-string.h \
-	src/testing/googletest/include/gtest/internal/gtest-tuple.h \
 	src/testing/googletest/include/gtest/internal/gtest-type-util.h \
 	src/testing/googletest/src/gtest.cc \
 	src/testing/googletest/src/gtest-death-test.cc \
 	src/testing/googletest/src/gtest-filepath.cc \
 	src/testing/googletest/src/gtest-internal-inl.h \
+	src/testing/googletest/src/gtest-matchers.cc \
 	src/testing/googletest/src/gtest-port.cc \
 	src/testing/googletest/src/gtest-printers.cc \
 	src/testing/googletest/src/gtest-test-part.cc \
@@ -1480,20 +1481,21 @@ EXTRA_DIST = \
 	src/testing/googlemock/include/gmock/gmock.h \
 	src/testing/googlemock/include/gmock/gmock-actions.h \
 	src/testing/googlemock/include/gmock/gmock-cardinalities.h \
+	src/testing/googlemock/include/gmock/gmock-function-mocker.h \
 	src/testing/googlemock/include/gmock/gmock-generated-actions.h \
 	src/testing/googlemock/include/gmock/gmock-generated-function-mockers.h \
 	src/testing/googlemock/include/gmock/gmock-generated-matchers.h \
-	src/testing/googlemock/include/gmock/gmock-generated-nice-strict.h \
 	src/testing/googlemock/include/gmock/gmock-matchers.h \
 	src/testing/googlemock/include/gmock/gmock-more-actions.h \
 	src/testing/googlemock/include/gmock/gmock-more-matchers.h \
+	src/testing/googlemock/include/gmock/gmock-nice-strict.h \
 	src/testing/googlemock/include/gmock/gmock-spec-builders.h \
 	src/testing/googlemock/include/gmock/internal/custom/gmock-generated-actions.h \
 	src/testing/googlemock/include/gmock/internal/custom/gmock-matchers.h \
 	src/testing/googlemock/include/gmock/internal/custom/gmock-port.h \
-	src/testing/googlemock/include/gmock/internal/gmock-generated-internal-utils.h \
 	src/testing/googlemock/include/gmock/internal/gmock-internal-utils.h \
 	src/testing/googlemock/include/gmock/internal/gmock-port.h \
+	src/testing/googlemock/include/gmock/internal/gmock-pp.h \
 	src/testing/googlemock/src/gmock.cc \
 	src/testing/googlemock/src/gmock-cardinalities.cc \
 	src/testing/googlemock/src/gmock-internal-utils.cc \
diff --git a/Makefile.in b/Makefile.in
index 2e3793ab..4b23a877 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3334,6 +3334,7 @@ EXTRA_DIST = \
 	src/processor/testdata/microdump.stackwalk.machine_readable-arm.out \
 	src/processor/testdata/microdump-withcrashreason.dmp \
 	src/processor/testdata/microdump-x86.dmp \
+	src/processor/testdata/minidump_32bit_crash_addr.dmp \
 	src/processor/testdata/minidump2.dmp \
 	src/processor/testdata/minidump2.dump.out \
 	src/processor/testdata/minidump2.stackwalk.machine_readable.out \
@@ -3364,6 +3365,7 @@ EXTRA_DIST = \
 	src/processor/testdata/test_app.cc \
 	src/testing/googletest/include/gtest/gtest.h \
 	src/testing/googletest/include/gtest/gtest-death-test.h \
+	src/testing/googletest/include/gtest/gtest-matchers.h \
 	src/testing/googletest/include/gtest/gtest-message.h \
 	src/testing/googletest/include/gtest/gtest-param-test.h \
 	src/testing/googletest/include/gtest/gtest-printers.h \
@@ -3378,18 +3380,17 @@ EXTRA_DIST = \
 	src/testing/googletest/include/gtest/internal/gtest-death-test-internal.h \
 	src/testing/googletest/include/gtest/internal/gtest-filepath.h \
 	src/testing/googletest/include/gtest/internal/gtest-internal.h \
-	src/testing/googletest/include/gtest/internal/gtest-linked_ptr.h \
 	src/testing/googletest/include/gtest/internal/gtest-param-util-generated.h \
 	src/testing/googletest/include/gtest/internal/gtest-param-util.h \
 	src/testing/googletest/include/gtest/internal/gtest-port-arch.h \
 	src/testing/googletest/include/gtest/internal/gtest-port.h \
 	src/testing/googletest/include/gtest/internal/gtest-string.h \
-	src/testing/googletest/include/gtest/internal/gtest-tuple.h \
 	src/testing/googletest/include/gtest/internal/gtest-type-util.h \
 	src/testing/googletest/src/gtest.cc \
 	src/testing/googletest/src/gtest-death-test.cc \
 	src/testing/googletest/src/gtest-filepath.cc \
 	src/testing/googletest/src/gtest-internal-inl.h \
+	src/testing/googletest/src/gtest-matchers.cc \
 	src/testing/googletest/src/gtest-port.cc \
 	src/testing/googletest/src/gtest-printers.cc \
 	src/testing/googletest/src/gtest-test-part.cc \
@@ -3397,20 +3398,21 @@ EXTRA_DIST = \
 	src/testing/googlemock/include/gmock/gmock.h \
 	src/testing/googlemock/include/gmock/gmock-actions.h \
 	src/testing/googlemock/include/gmock/gmock-cardinalities.h \
+	src/testing/googlemock/include/gmock/gmock-function-mocker.h \
 	src/testing/googlemock/include/gmock/gmock-generated-actions.h \
 	src/testing/googlemock/include/gmock/gmock-generated-function-mockers.h \
 	src/testing/googlemock/include/gmock/gmock-generated-matchers.h \
-	src/testing/googlemock/include/gmock/gmock-generated-nice-strict.h \
 	src/testing/googlemock/include/gmock/gmock-matchers.h \
 	src/testing/googlemock/include/gmock/gmock-more-actions.h \
 	src/testing/googlemock/include/gmock/gmock-more-matchers.h \
+	src/testing/googlemock/include/gmock/gmock-nice-strict.h \
 	src/testing/googlemock/include/gmock/gmock-spec-builders.h \
 	src/testing/googlemock/include/gmock/internal/custom/gmock-generated-actions.h \
 	src/testing/googlemock/include/gmock/internal/custom/gmock-matchers.h \
 	src/testing/googlemock/include/gmock/internal/custom/gmock-port.h \
-	src/testing/googlemock/include/gmock/internal/gmock-generated-internal-utils.h \
 	src/testing/googlemock/include/gmock/internal/gmock-internal-utils.h \
 	src/testing/googlemock/include/gmock/internal/gmock-port.h \
+	src/testing/googlemock/include/gmock/internal/gmock-pp.h \
 	src/testing/googlemock/src/gmock.cc \
 	src/testing/googlemock/src/gmock-cardinalities.cc \
 	src/testing/googlemock/src/gmock-internal-utils.cc \