diff --git a/.gitignore b/.gitignore
index 2104635e82..bf937369ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@
 /tools_webrtc/audio_quality/win/*.exe
 /tools_webrtc/audio_quality/win/*.dll
 /tools_webrtc/video_quality_toolchain/linux/ffmpeg
+/tools_webrtc/video_quality_toolchain/linux/frame_analyzer
 /tools_webrtc/video_quality_toolchain/linux/zxing
 /tools_webrtc/video_quality_toolchain/mac/ffmpeg
 /tools_webrtc/video_quality_toolchain/mac/zxing
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 521944546f..05ddef876a 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -164,7 +164,6 @@ if (is_android) {
 
     deps = [
       ":AppRTCMobile_javalib",
-      "../rtc_tools:frame_analyzer",
       "../sdk/android:libjingle_peerconnection_java",
       "//third_party/android_support_test_runner:rules_java",
       "//third_party/android_support_test_runner:runner_java",
@@ -185,8 +184,8 @@ if (is_android) {
       "../rtc_tools/testing/build_apprtc.py",
       "../rtc_tools/testing/utils.py",
       "../tools_webrtc/video_quality_toolchain/linux/ffmpeg",
+      "../tools_webrtc/video_quality_toolchain/linux/frame_analyzer",
       "../tools_webrtc/video_quality_toolchain/linux/zxing",
-      "${root_out_dir}/frame_analyzer",
     ]
   }
 }
diff --git a/examples/androidtests/video_quality_loopback_test.py b/examples/androidtests/video_quality_loopback_test.py
index 9a4c386020..225f885273 100755
--- a/examples/androidtests/video_quality_loopback_test.py
+++ b/examples/androidtests/video_quality_loopback_test.py
@@ -192,7 +192,7 @@ def RunTest(android_device, adb_path, build_dir, temp_dir, num_retries,
 
   # Run comparison script.
   compare_script = os.path.join(SRC_DIR, 'rtc_tools', 'compare_videos.py')
-  frame_analyzer = os.path.join(build_dir, 'frame_analyzer')
+  frame_analyzer = os.path.join(TOOLCHAIN_DIR, 'frame_analyzer')
   zxing_path = os.path.join(TOOLCHAIN_DIR, 'zxing')
   stats_file_ref = os.path.join(temp_dir, 'stats_ref.txt')
   stats_file_test = os.path.join(temp_dir, 'stats_test.txt')
@@ -241,3 +241,4 @@ def main():
 
 if __name__ == '__main__':
   sys.exit(main())
+
diff --git a/tools_webrtc/video_quality_toolchain/linux/frame_analyzer.sha1 b/tools_webrtc/video_quality_toolchain/linux/frame_analyzer.sha1
new file mode 100644
index 0000000000..9f7d4e9f74
--- /dev/null
+++ b/tools_webrtc/video_quality_toolchain/linux/frame_analyzer.sha1
@@ -0,0 +1 @@
+fe3e1e5253a1a49277e3ec9c0699ccf059cd8601
\ No newline at end of file