[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-Commit-Position: refs/heads/master@{#635526}

android_webview/tools/apk_merger.py

@@ -201,11 +201,12 @@ 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)