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

This reverts commit c5612605.

Reason for revert: Breaking 11 autorollers into Chromium. See https://bugs.chromium.org/p/chromium/issues/detail?id=906114

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=thakis@chromium.org,hans@chromium.org,martiniss@chromium.org,ehmaldonado@chromium.org

Change-Id: Ib8984eb1b295f9695758fc9700024927ba75d9ed
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 875037
Reviewed-on: https://chromium-review.googlesource.com/c/1340521Reviewed-by: Ravi Mistry <rmistry@chromium.org>
Commit-Queue: Ravi Mistry <rmistry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608835}

DEPS

@@ -49,6 +49,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',