Merge "Fixed CtsVerifier version" into marshmallow-cts-dev