Merge "DO NOT MERGE: Revert "Add build number into CTS Verifier."" into marshmallow-cts-dev