Revert "[build] Update APK merger to handle additional libcrashpad_handler_trampoline.so"

This reverts commit 4ca5e5564dd46aaa05cd3c981b13bb561e4248d8.

Reason for revert: crbug.com/936336

Original change's description:
> [build] Update APK merger to handle additional libcrashpad_handler_trampoline.so
>
> Bug: 928422
> Change-Id: I1e19e4c493dab562d0757c7c00c3e7146f7f35c6
> Reviewed-on: https://chromium-review.googlesource.com/c/1489060
> Commit-Queue: Ben Mason <benmason@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Cr-Original-Commit-Position: refs/heads/master@{#635526}(cherry picked from commit 8cd72d6b)
> Reviewed-on: https://chromium-review.googlesource.com/c/1489251
> Reviewed-by: Ben Mason <benmason@chromium.org>
> Cr-Commit-Position: refs/branch-heads/3718@{#3}
> Cr-Branched-From: 79a6357d-refs/heads/master@{#635377}

TBR=benmason@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 928422, 936336
Change-Id: I705c2c99c7e500bdd6bf8a6858bbece5bf665eb1
Reviewed-on: https://chromium-review.googlesource.com/c/1493707Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Original-Original-Commit-Position: refs/branch-heads/3718@{#16}
Cr-Original-Original-Branched-From: 79a6357d-refs/heads/master@{#635377}(cherry picked from commit 5001458301b31b2599ce1b176085d64c5e432355)
Reviewed-on: https://chromium-review.googlesource.com/c/1493710
Cr-Original-Commit-Position: refs/branch-heads/3720@{#5}
Cr-Original-Branched-From: 08999f29-refs/heads/master@{#636200}(cherry picked from commit d922ffe1c12b58611b7e058392e77c9aee0a0ab7)
Reviewed-on: https://chromium-review.googlesource.com/c/1493711
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636350}

android_webview/tools/apk_merger.py

@@ -201,12 +201,11 @@ def MergeApk(args, tmp_apk, tmp_dir_32, tmp_dir_64):
   assets_path = 'base/assets' if args.bundle else 'assets'
   exclude_files_64 = ['%s/snapshot_blob_32.bin' % assets_path,
                       GetTargetAbiPath(args.apk_32bit, args.shared_library)]
+  # TODO(benmason): Remove when libcrashpad_handler.so
+  # is no longer a separate lib.
   if 'libcrashpad_handler.so' in expected_files:
     exclude_files_64.append(
         GetTargetAbiPath(args.apk_32bit, 'libcrashpad_handler.so'))
-  if 'libcrashpad_handler_trampoline.so' in expected_files:
-    exclude_files_64.append(
-        GetTargetAbiPath(args.apk_32bit, 'libcrashpad_handler_trampoline.so'))
   UnpackApk(args.apk_64bit, tmp_dir_64, exclude_files_64)
   UnpackApk(args.apk_32bit, tmp_dir_32)