Revert "Reland "Remove workaround made unnecessary by...

Revert "Reland "Remove workaround made unnecessary by https://chromium-review.googlesource.com/c/1312234""

This reverts commit 1ffe990d.

Reason for revert:
roll-dep is still broken with this (https://bugs.chromium.org/p/chromium/issues/detail?id=906114#c19)

Original change's description:
> Reland "Remove workaround made unnecessary by https://chromium-review.googlesource.com/c/1312234"
> 
> This is a reland of c5612605
> 
> Original change's description:
> > Remove workaround made unnecessary by https://chromium-review.googlesource.com/c/1312234
> >
> > Bug: 875037
> > Change-Id: Ia4a6393237602b88bb0130d9f916972e930d95b3
> > Reviewed-on: https://chromium-review.googlesource.com/c/1339339
> > Reviewed-by: Hans Wennborg <hans@chromium.org>
> > Commit-Queue: Nico Weber <thakis@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#608783}
> 
> TBR=hans
> 
> Bug: 875037
> Change-Id: Iac24d9ec462cd4d5720d78a52b7f867be3ab2ec7
> Reviewed-on: https://chromium-review.googlesource.com/c/1344198
> Commit-Queue: Hans Wennborg <hans@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#609974}

TBR=thakis@chromium.org,hans@chromium.org,martiniss@chromium.org,ehmaldonado@chromium.org

Change-Id: I1b2327216797da231e11427a29edece425cd35bd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 875037
Reviewed-on: https://chromium-review.googlesource.com/c/1347333Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610177}

DEPS

@@ -48,6 +48,11 @@ vars = {
   # purposes.
   'checkout_configuration': 'default',
 
+  # By default, don't check out android. Will be overridden by gclient
+  # variables.
+  # TODO(ehmaldonado): Remove this once the bug in gclient is fixed.
+  'checkout_android': False,
+
   # Pull in Android native toolchain dependencies for Chrome OS too, so we can
   # build ARC++ support libraries.
   'checkout_android_native_support': 'checkout_android or checkout_chromeos',