Partial revert of "Do not bundle compiler-rt libraries (ASan,UBSan,Profile) for Android on i686.".

This reverts commit 1501aabf.

Reason for revert: broke a build that was used for fuzzing: crbug.com/877063.

Original change's description:
> Do not bundle compiler-rt libraries (ASan,UBSan,Profile) for Android on i686.
>
> This change removes 6+ MB of binaries from the build tools bundle:
> 3.7M	lib/linux/libclang_rt.asan-i686-android.so
> 2.5M	lib/linux/libclang_rt.ubsan_standalone-i686-android.so
> 80K	lib/linux/libclang_rt.profile-i686-android.a
>
> It also can break some workflows, but as discussed in person, there is a good
> chance that no one is using those libraries on i686 arch.
>
>
> Bug: 866225
> Change-Id: Ifbc85e542359681f60f19f52e5bd7a8a7e1655f3
> Reviewed-on: https://chromium-review.googlesource.com/1158708
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Max Moroz <mmoroz@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#579854}


R=hans@chromium.org, inferno@chromium.org, thakis@chromium.org

Bug: 877063
Change-Id: Ic5754458e6516dc25cf4cedaeb7eb9195faafbec
Reviewed-on: https://chromium-review.googlesource.com/1187629
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585731}

tools/clang/scripts/update.py

@@ -836,8 +836,9 @@ def UpdateClang(args):
       RunCommand(['ninja', 'asan', 'ubsan', 'profile'])
 
       # And copy them into the main build tree.
+      asan_lib_path_format = 'lib/linux/libclang_rt.asan-{0}-android.so',
       libs_want = [
-          'lib/linux/libclang_rt.asan-{0}-android.so',
+          asan_lib_path_format,
           'lib/linux/libclang_rt.ubsan_standalone-{0}-android.so',
           'lib/linux/libclang_rt.profile-{0}-android.a',
       ]
@@ -847,6 +848,11 @@ def UpdateClang(args):
           if os.path.exists(lib_path):
             shutil.copy(lib_path, rt_lib_dst_dir)
 
+      # We also use ASan i686 build for fuzzing.
+      lib_path = os.path.join(build_dir, asan_lib_path_format.format('i686'))
+      if os.path.exists(lib_path):
+        shutil.copy(lib_path, rt_lib_dst_dir)
+
   # Run tests.
   if args.run_tests or use_head_revision:
     os.chdir(LLVM_BUILD_DIR)