Merge "Correct CtsVerifier version." into stage-aosp-tm-ts-dev