diff --git a/config/android/config.gni b/config/android/config.gni
index a533ce961..bbaa4b5f3 100644
--- a/config/android/config.gni
+++ b/config/android/config.gni
@@ -39,16 +39,16 @@ if (is_android) {
       # Android SDK release. Currently, only "o_mr1" is publicly supported.
       android_sdk_release = default_android_sdk_release
     }
+  }
 
-    # This is the result of profiling Chromium. Blindly applying it to arbitrary
-    # downstream projects and hoping it'll grant a speedup seems fragile. (Not
-    # to mention that it resides in a Chromium-specific directory.)
-    if (build_with_chromium) {
-      # The default AFDO profile used by public builds. Value may differ in
-      # internal builds.
-      clang_default_afdo_profile =
-          rebase_path("//chrome/android/profiles/chrome-profile-3309-text.prof")
-    }
+  # This is the result of profiling Chromium. Blindly applying it to arbitrary
+  # downstream projects and hoping it'll grant a speedup seems fragile. (Not
+  # to mention that it resides in a Chromium-specific directory.)
+  # FIXME(gbiv): remove the !defined() check after removing custom profiling
+  # logic from //clank.
+  if (!defined(clang_default_afdo_profile) && build_with_chromium) {
+    clang_default_afdo_profile =
+        rebase_path("//chrome/android/profiles/afdo.prof")
   }
 
   if (!defined(extra_chrome_shared_library_configs)) {
diff --git a/install-build-deps-android.sh b/install-build-deps-android.sh
index 15fea8517..860f8f5bf 100755
--- a/install-build-deps-android.sh
+++ b/install-build-deps-android.sh
@@ -37,6 +37,9 @@ sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386
 # Required for apk-patch-size-estimator
 sudo apt-get -y install bsdiff
 
+# Needed to unpack the profiles we pull with `gclient runhooks`
+sudo apt-get -y install bzip2
+
 # Do our own error handling for java.
 set +e