Merge "CTS Verifier Packaging and Versioning" into gingerbread