Use the actual Chrome OS AFDO profiles on Android

(This is also the third attempt roll to a newer AFDO profile, which
we're currently using internally.)

While the gs bucket that holds these profiles is restricted to Googlers
only, our Chrome OS friends jump through hoops specifically to make
these AFDO profiles world-readable. So, all of the crazy redaction and
such that we're currently doing is entirely unnecessary. Woo!

As noted in the script, due to the permissions setup, actually accessing
these profiles is a bit awkward. But it's workable.

also ran update_afdo_profile.py on a few profiles from a non-Google
machine, and it succeeded on the ones I tried. Also ran
build/install-build-deps-android.sh.

Bug: 804479
Test: `gclient runhooks` and built for Android with/without clank. I
Change-Id: I20d973b62251ebe249e80fad6051bd3a6805aa12
Reviewed-on: https://chromium-review.googlesource.com/879849
Commit-Queue: George Burgess <gbiv@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#531368}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 1f751e41506c1b1c875ca589681872f725b6d7ab

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)) {

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