Build/Test Tools: Post-branching updates for `trunk`.

Reviewed by SergeyBiryukov.

See #64966.

git-svn-id: https://develop.svn.wordpress.org/trunk@62160 602fd350-edb4-49c9-b593-d223f7449a82