Fix apk merger to ignore unwind_cfi built in arm64

BUG=924842

Change-Id: Ic9437bd02e0196b82b2896960c8c2eb7f0cc289c
Reviewed-on: https://chromium-review.googlesource.com/c/1496316Reviewed-by: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: ssid <ssid@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636862}

android_webview/tools/apk_merger.py

@@ -207,6 +207,8 @@ def MergeApk(args, tmp_apk, tmp_dir_32, tmp_dir_64):
   if 'libcrashpad_handler_trampoline.so' in expected_files:
     exclude_files_64.append(
         GetTargetAbiPath(args.apk_32bit, 'libcrashpad_handler_trampoline.so'))
+  if args.has_unwind_cfi:
+    exclude_files_64.append('%s/unwind_cfi_32' % assets_path)
   UnpackApk(args.apk_64bit, tmp_dir_64, exclude_files_64)
   UnpackApk(args.apk_32bit, tmp_dir_32)