GitLab

This reverts commit 93aa458f.

Reason for revert: Suspect for build failure https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/android-rel/2802

Original change's description:
> Android build: moved proguarding into dex() for most cases
> 
> This is to allow R8 to proguard and dex in one call, since it has some
> optimizations that only work when doing everything in one shot.
> 
> Bug: 872904
> Change-Id: Id2c75dac4d9feecae461a0b1e279056253f1b71b
> Reviewed-on: https://chromium-review.googlesource.com/c/1227142
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Commit-Queue: Sam Maier <smaier@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#597257}

TBR=yfriedman@chromium.org,agrieve@chromium.org,smaier@chromium.org

Change-Id: Idf8f855094fb1bf4c4e1b47326b76166a158c1e8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 872904
Reviewed-on: https://chromium-review.googlesource.com/c/1265559Reviewed-by: Kevin McNee <mcnee@chromium.org>
Commit-Queue: Kevin McNee <mcnee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597274}