resolve merge conflicts of bc3246481d391927f4f4f9b5da20e7c97129b9ca to rvc-dev

Bug: b/167405184

Change-Id: Ic141c367a6ecd242e860d4616001200cca394090
Merged-In: I4d06b4fa190d6185b15aa98cb6f1a33f9702981e
(cherry picked from commit 4a5db22a77a4f2c53a4b6fc16bbf416e5c73f6fa)
diff --git a/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_bootstrap.asciipb b/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_bootstrap.asciipb
new file mode 100644
index 0000000..992204c
--- /dev/null
+++ b/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_bootstrap.asciipb
@@ -0,0 +1,15 @@
+drops {
+  dest_file: "0.14.0.4ad3103/bootstrap"
+  version: "0.14.0.4ad3103"
+  version_group: "rbe"
+  git_project: "platform/prebuilts/remoteexecution-client"
+  git_branch: "master"
+  kokoro_drop {
+    full_job_name: "re-client/gcp_ubuntu/release"
+    build_number: "139"
+    artifact_gcs_bucket: "reclient-release-artifacts"
+    artifact_root: "prod/re-client/gcp_ubuntu/release/139/20200914-032755"
+    artifact_name: "bootstrap"
+    artifact_permission_mode: "755"
+  }
+}
diff --git a/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_dumpstats.asciipb b/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_dumpstats.asciipb
new file mode 100644
index 0000000..a4e54a1
--- /dev/null
+++ b/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_dumpstats.asciipb
@@ -0,0 +1,15 @@
+drops {
+  dest_file: "0.14.0.4ad3103/dumpstats"
+  version: "0.14.0.4ad3103"
+  version_group: "rbe"
+  git_project: "platform/prebuilts/remoteexecution-client"
+  git_branch: "master"
+  kokoro_drop {
+    full_job_name: "re-client/gcp_ubuntu/release"
+    build_number: "139"
+    artifact_gcs_bucket: "reclient-release-artifacts"
+    artifact_root: "prod/re-client/gcp_ubuntu/release/139/20200914-032755"
+    artifact_name: "dumpstats"
+    artifact_permission_mode: "755"
+  }
+}
diff --git a/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_reproxy.asciipb b/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_reproxy.asciipb
new file mode 100644
index 0000000..c6df641
--- /dev/null
+++ b/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_reproxy.asciipb
@@ -0,0 +1,15 @@
+drops {
+  dest_file: "0.14.0.4ad3103/reproxy"
+  version: "0.14.0.4ad3103"
+  version_group: "rbe"
+  git_project: "platform/prebuilts/remoteexecution-client"
+  git_branch: "master"
+  kokoro_drop {
+    full_job_name: "re-client/gcp_ubuntu/release"
+    build_number: "139"
+    artifact_gcs_bucket: "reclient-release-artifacts"
+    artifact_root: "prod/re-client/gcp_ubuntu/release/139/20200914-032755"
+    artifact_name: "reproxy"
+    artifact_permission_mode: "755"
+  }
+}
diff --git a/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_rewrapper.asciipb b/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_rewrapper.asciipb
new file mode 100644
index 0000000..6ba248d
--- /dev/null
+++ b/.prebuilt_info/rbe/prebuilt_info_0_14_0_4ad3103_rewrapper.asciipb
@@ -0,0 +1,15 @@
+drops {
+  dest_file: "0.14.0.4ad3103/rewrapper"
+  version: "0.14.0.4ad3103"
+  version_group: "rbe"
+  git_project: "platform/prebuilts/remoteexecution-client"
+  git_branch: "master"
+  kokoro_drop {
+    full_job_name: "re-client/gcp_ubuntu/release"
+    build_number: "139"
+    artifact_gcs_bucket: "reclient-release-artifacts"
+    artifact_root: "prod/re-client/gcp_ubuntu/release/139/20200914-032755"
+    artifact_name: "rewrapper"
+    artifact_permission_mode: "755"
+  }
+}
diff --git a/.prebuilt_info/rbe/prebuilt_info_CHANGELOG_md.asciipb b/.prebuilt_info/rbe/prebuilt_info_CHANGELOG_md.asciipb
index 2d50607..e4f9e48 100644
--- a/.prebuilt_info/rbe/prebuilt_info_CHANGELOG_md.asciipb
+++ b/.prebuilt_info/rbe/prebuilt_info_CHANGELOG_md.asciipb
@@ -1,14 +1,14 @@
 drops {
   dest_file: "CHANGELOG.md"
-  version: "0.13.6.96bba15"
+  version: "0.14.0.4ad3103"
   version_group: "rbe"
   git_project: "platform/prebuilts/remoteexecution-client"
   git_branch: "master"
   kokoro_drop {
     full_job_name: "re-client/gcp_ubuntu/release"
-    build_number: "109"
+    build_number: "139"
     artifact_gcs_bucket: "reclient-release-artifacts"
-    artifact_root: "prod/re-client/gcp_ubuntu/release/109/20200810-111856"
+    artifact_root: "prod/re-client/gcp_ubuntu/release/139/20200914-032755"
     artifact_name: "CHANGELOG.md"
     artifact_permission_mode: "640"
   }
diff --git a/0.14.0.4ad3103/bootstrap b/0.14.0.4ad3103/bootstrap
new file mode 100755
index 0000000..802cdb0
--- /dev/null
+++ b/0.14.0.4ad3103/bootstrap
Binary files differ
diff --git a/0.14.0.4ad3103/dumpstats b/0.14.0.4ad3103/dumpstats
new file mode 100755
index 0000000..83c39af
--- /dev/null
+++ b/0.14.0.4ad3103/dumpstats
Binary files differ
diff --git a/0.14.0.4ad3103/reproxy b/0.14.0.4ad3103/reproxy
new file mode 100755
index 0000000..c298a81
--- /dev/null
+++ b/0.14.0.4ad3103/reproxy
Binary files differ
diff --git a/0.14.0.4ad3103/rewrapper b/0.14.0.4ad3103/rewrapper
new file mode 100755
index 0000000..7b36a08
--- /dev/null
+++ b/0.14.0.4ad3103/rewrapper
Binary files differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eac251a..259ae3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,149 @@
-## Release 0.13.6 (2020-08-10)
+## Release 0.14.0 (2020-09-11)
 ```
 Changes:
- + 4e475e2:
+ + d91fa91:
+ roll bazel_gazelle to v0.22.0
+ + 2d0e007:
+ bootstrap: delete isProxyRunning
+ + f72dc2c:
+ roll google.golang.org/protobuf to v1.25.0
+ + ce3415c:
+ use named-pipe for rewrapper<->reproxy on windows
+ + e3c3cfd:
+ reproxy: fail early by checking capabilities at startup
+ + 179f7f1:
+ set cipd tag and ref
+ + 204335e:
+ kookro/gcp_windows: factor out setup.bat
+ + 1eb8585:
+ Holdoff: don't race until need for execution is confirmed.
+ + 6500ce5:
+ Bump remote-apis-sdks to include revert of batch download change
+ + 6e51ab5:
+ Simplifying existing racing code a bit
+ + 1d7399a:
+ Bump remote-apis-sdks commit
+ + 17bd91b:
+ workaround http://b/167946840 gcp_windows/presubmit failing
+ + d491028:
+ Move CIPD package to correct location.
+ + bbb12bc:
+ Deprecate the env_var_whitelist flag.
+ + 5858398:
+ roll rules_go to 0.24.1
+ + e7fd4a9:
+ bootstrap to persist a pid file for identifying reproxy in shutdown.
+ + 210eeea:
+ test tests/integ/remoteexec in gcp_windows/continous
+ + 0a146ec:
+ Add flag to control local pool parallelism.
+ + 1bb012a:
+ Change stdout/stderr to bytes instead of string
+ + 48dfb08:
+ Run the cipd binary after a release to create and upload the cipd package for the rbe binaries.
+ + 40635e5:
+ chromium windows integration test
+ + f09e059:
+ roll rules_go to v0.24.0
+ + 33f1571:
+ Fix various issues with racing.
+ + 8396941:
+ Change default bootstrap wait time to 20 seconds.
+ + 507c0e7:
+ Add the racing exec strategy.
+ + 050d94d:
+ Add the action struct to improve server.go readability.
+ + 3bc22d0:
+ Update preprocessor so it removes flags we want removed when the previous flag is -Xclang.
+ + d0b12c2:
+ fix precommit for windows
+ + 3258cff:
+ Refactor local execution to use the outerr package and add non-blocking execution.
+ + feb33b8:
+ Add instructions on how to install the precommit hook.
+ + 470d4bc:
+ Add precommit script to run gofmt/golint/gazelle.
+```
+
+## Release 0.13.7 (2020-08-21)
+```
+Changes:
+ + 0d25d98:
+ Increase gRPC max message size
+ + 85c7538:
+ Do not use toolchain inputs when there's an error
+ + 97b2e33:
+ integ test doesn't need to use moreflag
+ + b04537c:
+ Remove the metalava version check from the toolchain input processor.
+ + 9f14c07:
+ delete gazell:ignore
+ + e9fe9f2:
+ roll protobuf to 3.13.0
+ + 79d5af9:
+ roll bazel-gazelle to 0.21.1
+ + eb2e12d:
+ Add writable to the cipd install directory.
+ + 0df8d29:
+ use test_env rather than action_env for test
+ + ac6bc28:
+ integ: use data deps instead of flag with $(location)
+ + 7dde86c:
+ refactor BuildClangCommand
+ + 165e768:
+ flagsparser: use clang's Options.td to parse clang flags.
+ + 11c7804:
+ move reproxy_dep_test into own dir
+ + 61500ef:
+ roll rules_go 0.23.8
+ + 7344b85:
+ reproxy: set default platform OSFamily properties.
+ + 5e7b160:
+ make sure remoteexec calls remote-apis, not local fallback
+ + 8622f88:
+ roll rules_go 0.23.7
+ + b9c7215:
  Revert "Merge "Fixing remote compare mode to update the action result with the local run results.""
+ + 41c7c67:
+ Migrate javac input processor to the new preprocessor.
+ + 9cdbae9:
+ Cleanup clang related input processors now that all clang dependent input processors are migrated.
+ + 87c1361:
+ Migrate clang links to the new preprocessor.
+ + 5aee2df:
+ Migrate clang CL to the new preprocessor.
+ + 5136612:
+ Migrate header abi dumper to the new preprocessor.
+ + 7e40a68:
+ Migrate clanglint to the new prerprocessor.
+ + a39a537:
+ Migrate cpp input processor to the new Preprocessor.
+ + 2f043c3:
+ Move the clang flagparser to a new package.
+ + df3ae15:
+ Migrate metalava to the new preprocessor.
+ + 1e4dffc:
+ Migrate r8 input processor to the new Preprocessor.
+ + 1441cc4:
+ Migrate the d8 label to the new Preprocessor.
+ + 7199f56:
+ Migrate the tool label to the new Preprocessor.
+ + b0593d3:
+ Add Preprocessor and BasePreprocessor
+ + 0f1d451:
+ roll rules_go v0.23.6
+ + 3bd9fd2:
+ cleanup patch for llvm.
+ + 470f86c:
+ install the new msys2 keyring
+ + 48d326d:
+ roll rules_go to 0.23.5
+ + db0c65a:
+ Fix broken gazelle after adding gen_clang_cl_flags
+ + 204d8a1:
+ Remove shadow headers.
+ + f221db8:
+ Add a coverage report to the linux presubmit.
 ```
 
 ## Release 0.13.5 (2020-07-23)
diff --git a/latest b/latest
index e1231ee..a576b1b 120000
--- a/latest
+++ b/latest
@@ -1 +1 @@
-0.13.6.96bba15
+0.14.0.4ad3103
\ No newline at end of file
diff --git a/live b/live
index 3f5d76d..a576b1b 120000
--- a/live
+++ b/live
@@ -1 +1 @@
-0.13.6.96bba15
\ No newline at end of file
+0.14.0.4ad3103
\ No newline at end of file