GitLab

This (mostly) reverts commit f0ecb909,
except that it increments the current_version.gni instead of reverting
it.

Reason for revert: I need to modify the shell apk and push it now
but this CL needs to wait for WAM server change to be pushable.

Original change's description:
> [Android WebAPK] Link to a shortcuts file from the manifest.
>
> Instructions for enabling Android shortcuts:
> https://developer.android.com/guide/topics/ui/shortcuts/creating-shortcuts
>
> This is the first step for enabling shortcuts. The server will populate
> shortcuts.xml depending on the Manifest shortcuts provided (and also
> generate additional string resource files).

> Bug: 1010471
> Change-Id: I2e0a6118a22869766e4b5e849dabc6533cd2d306
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864805
> Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
> Commit-Queue: Rayan Kanso <rayankans@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#707889}

Bug: 1010471
Change-Id: I0b302074e4b218f96e7ec8b7b1686ea1b6825b28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1885213
Commit-Queue: Henry Jian <hzjian@google.com>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710472}