GitLab

This change should be a no-op in terms of build output, and has been
tested by diffing APK/AAB output (other than a correction in
Trichrome6432, a currently unused config).

The change prepares to support 32-bit only Monochrome and Trichrome
configs on 64-bit build configurations. The following is happening here:

- Support all four version number variations.

- Make any target that builds on both 32 and 64-bit explicit about it's
  configuration.  Eg. "monochrome" on 64-bit implies a 32-bit browser,
  with a 64-bit Webview companion library.

- Refactor logic for readability.

Bug: 1027573
Change-Id: Ia37a9011717e7c2269cc9b87e817e1e9fd6ef888
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940355Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721809}