GitLab

This reverts commit 8a5a16af.

Reason for revert: Suspected cause of breakage on android-rel:
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/android-rel/6359

Original change's description:
> Android: Replace desugar with d8 and r8 for debug
> 
> For release builds, desugar.jar still runs first, before d8 or r8, so
> nothing is changing for them as by the time d8 or r8 runs, the code has
> already been desugared.
> 
> When r8 is enabled, it can desugar all targets that enable proguard, and
> d8 can desugar all targets that do not enable proguard.
> 
> This can only be turned on once r8 replaces proguard since proguard does
> not understand java 8 code that has not been desugared already.
> 
> Bug: 906803, 913679, 916733
> Change-Id: I3fcc5a20b38e7fdc78cdeed1533583675d58346b
> Reviewed-on: https://chromium-review.googlesource.com/c/1384945
> Reviewed-by: Sam Maier <smaier@chromium.org>
> Commit-Queue: Peter Wen <wnwen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#619434}

TBR=wnwen@chromium.org,smaier@chromium.org

Change-Id: I5591321bd6369f4fb9de3f1519b2c823775c048b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 906803, 913679, 916733
Reviewed-on: https://chromium-review.googlesource.com/c/1393425Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619447}