GitLab

This reverts commit bef92b91.

Reason for revert: Suspected cause of build failure on Android Cronet Builder:
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Android%20Cronet%20Builder/47611

Original change's description:
> Define basic Trichrome build targets.
> 
> This defines basic build targets for a Trichrome build using the
> upstream package names/configuration. The shared library APK contains
> the 32-bit version of libmonochrome.so and a few autogenerated Java
> pieces only at this stage, which means the total size of the three APKs
> is significantly larger than Monochrome at present.
> 
> Bug: 887078
> Change-Id: I3fcdfd6d7f717665a15c05dbb53602deda526b73
> Reviewed-on: https://chromium-review.googlesource.com/1135546
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Reviewed-by: Tobias Sargeant <tobiasjs@chromium.org>
> Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Commit-Queue: Richard Coles <torne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#594394}

TBR=digit@chromium.org,torne@chromium.org,tedchoc@chromium.org,agrieve@chromium.org,tobiasjs@chromium.org,tiborg@chromium.org

Change-Id: I1b20b37aa40558e28c3c8e98aeb7a8a2b8220cf2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 887078
Reviewed-on: https://chromium-review.googlesource.com/1246833Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594438}