GitLab

This reverts commit 9e256bdc.

Reason for reland: Fixed incremental_install=true error

> Original change's description:
> > Android: Fix secondary_abi_loadable_modules being ignored
> >
> > They worked in bundles, but not in apk targets.
> >
> > As identified in the linked bug, this was broken by:
> > e1dc23f1
> >
> > Verified contents of apks are same with & without this change:
> > * Monochrome.apk (with & without build_apk_secondary_abi)
> > * TrichromeChrome.aab
> > * TrichromeLibrary.apk
> > * SystemWebview.apk (with & without build_apk_secondary_abi)

TBR=agrieve  # reland

Bug: 1024862
Change-Id: I2ae7c6f4e1b70245a6320df54cd17ccef865909c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1933631Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718664}