Apply 96dc364d483bc12ab6f49bd9c214b639497d6198 to android-mainline#824

nathanchance merged 2 commits intoClangBuiltLinux:mainClangBuiltLinux/continuous-integration2:mainfrom

nathanchance:android-mainline-drop-arm-clang-13nathanchance/continuous-integration2:android-mainline-drop-arm-clang-13Copy head branch name to clipboard