Revert "infra: remove no longer needed LUCI options."

This reverts commit 4971af60.

Reason for revert: "ImportError: No module named httplib2" on CQ bots
https://luci-milo.appspot.com/p/chromium/builders/luci.chromium.ci/Headless%20Linux%20%28dbg%29/70541

Original change's description:
> infra: remove no longer needed LUCI options.
> 
> They became the default ones, no need to specify them.
> 
> R=​iannucci, vadimsh
> 
> No-Try: True
> Change-Id: Iebc66d8291fdebab72fcdb334e26befdc6d90bf3
> Reviewed-on: https://chromium-review.googlesource.com/c/1330288
> Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#607024}

TBR=iannucci@chromium.org,vadimsh@chromium.org,tandrii@chromium.org

Change-Id: Iee3d547f36dd6d583be555d6b35a3067ef592db4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/1330840Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607071}

infra/config/global/cr-buildbucket.cfg

@@ -599,6 +599,7 @@ buckets {
       dimensions: "cpu:x86-64"
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       execution_timeout_secs: 10800  # 3h
+      swarming_tags: "vpython:native-python-wrapper"
       build_numbers: YES
       # Adds dimension: "builder:<builder name>" to ensure builder affinity.
       # To "assign" a bot to a builder, bot config of swarming service should
@@ -609,6 +610,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         name: "chromium"
+        properties_j: "$kitchen:{\"git_auth\": true, \"devshell\": true}"
       }
     }
 
@@ -2740,6 +2742,7 @@ buckets {
       dimensions: "pool:luci.chromium.findit"
       service_account: "findit-builder@chops-service-accounts.iam.gserviceaccount.com"
       execution_timeout_secs: 28800  # 8h
+      swarming_tags: "vpython:native-python-wrapper"
       build_numbers: YES
       caches {
         path: "win_toolchain"
@@ -2752,6 +2755,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         name: "findit/chromium/compile"
+        properties_j: "$kitchen:{\"git_auth\": true, \"devshell\": true}"
       }
     }
 
@@ -2793,6 +2797,7 @@ buckets {
       dimensions: "cpu:x86-64"
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
       execution_timeout_secs: 10800  # 3h
+      swarming_tags: "vpython:native-python-wrapper"
       build_numbers: YES
       # Adds dimension: "builder:<builder name>" to ensure builder affinity.
       # To "assign" a bot to a builder, bot config of swarming service should
@@ -2806,6 +2811,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         name: "chromium_trybot"
+        properties_j: "$kitchen:{\"git_auth\": true, \"devshell\": true}"
       }
     }
 
@@ -3360,6 +3366,7 @@ buckets {
         name: "chromium"
       }
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      swarming_tags: "vpython:native-python-wrapper"
     }
 
     # Keep builders grouped by OS, then sorted by name.