Revert "Merge branch 'master' into sarahchen6/1.49.0-branch"

This reverts commit f3ee497, reversing
changes made to 3023be2.

Author: sarahchen6

.circleci/cancel_workflow.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu
+echo "Cancelling workflow ${CIRCLE_WORKFLOW_ID}"
+curl --request POST --url https://circleci.com/api/v2/workflow/$CIRCLE_WORKFLOW_ID/cancel --header "Circle-Token: ${CIRCLE_TOKEN}"

.circleci/checkout_merge_commit.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+CIRCLE_PULL_REQUEST="${CIRCLE_PULL_REQUEST:-}"
+CCI_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"
+
+if [[ "${CIRCLE_BRANCH:-}" != "master" && -n "${CCI_PR_NUMBER:-}" ]]
+then
+  FETCH_REFS="${FETCH_REFS:-} +refs/pull/${CCI_PR_NUMBER}/merge:refs/pull/${CCI_PR_NUMBER}/merge +refs/pull/${CCI_PR_NUMBER}/head:refs/pull/${CCI_PR_NUMBER}/head"
+  git fetch -u origin ${FETCH_REFS}
+  head_ref="$(git show-ref --hash refs/pull/${CCI_PR_NUMBER}/head)"
+  merge_ref="$(git show-ref --hash refs/pull/${CCI_PR_NUMBER}/merge)"
+  if git merge-base --is-ancestor "$head_ref" "$merge_ref"; then
+    git checkout "pull/${CCI_PR_NUMBER}/merge"
+  else
+    echo "[WARN] There is a merge conflict between master and PR ${CCI_PR_NUMBER}, merge branch cannot be checked out."
+    git checkout "pull/${CCI_PR_NUMBER}/head"
+  fi
+fi

.circleci/collect_libs.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# Save all important libs into (project-root)/libs
+# This folder will be saved by circleci and available after test runs.
+
+set -x
+set -e
+
+LIBS_DIR=./libs/
+mkdir -p $LIBS_DIR >/dev/null 2>&1
+
+cp /tmp/hs_err_pid*.log $LIBS_DIR || true
+cp /tmp/java_pid*.hprof $LIBS_DIR || true
+
+for lib_path in workspace/*/build/libs; do
+    echo "saving libs in $lib_path"
+    cp $lib_path/*.jar $LIBS_DIR/
+done