Revert "Reland "Reland "[ar] Do not refer to ARCore shim in APK merger"""

This reverts commit 2698a26d.

Reason for revert: this did not fix the build errors.

Original change's description:
> Reland "Reland "[ar] Do not refer to ARCore shim in APK merger""
> 
> This is a reland of f3f5b838
> 
> I think I've finally fixed the root issue and this is ready
> to land again.
> 
> Original change's description:
> > Reland "[ar] Do not refer to ARCore shim in APK merger"
> >
> > This is a reland of 58e4a081
> >
> > Original change's description:
> > > [ar] Do not refer to ARCore shim in APK merger
> > >
> > > This hard-coding should no longer be required.
> > >
> > > Bug: 839191
> > > Change-Id: Id44f0f19da6efcee90ef79ea3e241eb2a7ea5843
> > > Reviewed-on: https://chromium-review.googlesource.com/1147706
> > > Commit-Queue: Ian Vollick <vollick@chromium.org>
> > > Reviewed-by: Richard Coles <torne@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#577662}
> >
> > Bug: 839191
> > Change-Id: I42c3d31c0cbe49c1fe2d68c55d0db18dcdc3381d
> > Reviewed-on: https://chromium-review.googlesource.com/1151567
> > Reviewed-by: Richard Coles <torne@chromium.org>
> > Commit-Queue: Ian Vollick <vollick@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#578347}
> 
> Bug: 839191
> Change-Id: I2618d967b214fb8f21264d6303837b08729222c4
> Reviewed-on: https://chromium-review.googlesource.com/1152275
> Reviewed-by: Richard Coles <torne@chromium.org>
> Commit-Queue: Ian Vollick <vollick@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#579391}

TBR=vollick@chromium.org,torne@chromium.org

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

Bug: 839191
Change-Id: I5857ff149053eda03acbd6d2ccb8403667455b2c
Reviewed-on: https://chromium-review.googlesource.com/1158764
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579821}

android_webview/tools/apk_merger.py

@@ -117,6 +117,11 @@ def CheckFilesExpected(actual_files, expected_files, component_build):
   duplicate_file_set = set(
       f for f, n in actual_file_names.iteritems() if n > 1)
 
+  # TODO(crbug.com/839191): Remove this once we're plumbing the lib correctly.
+  missing_file_set = set(
+      f for f in missing_file_set if not os.path.basename(f) ==
+      'libarcore_sdk_c_minimal.so')
+
   errors = []
   if unexpected_file_set:
     errors.append(
@@ -172,6 +177,10 @@ def MergeApk(args, tmp_apk, tmp_dir_32, tmp_dir_64):
   if args.has_unwind_cfi:
     expected_files['unwind_cfi_32'] = False
 
+  # TODO(crbug.com/839191): we should pass this in via script arguments.
+  if not args.loadable_module_32:
+    args.loadable_module_32.append('libarcore_sdk_c_minimal.so')
+
   for f in args.loadable_module_32:
     expected_files[f] = not args.uncompress_shared_libraries