am bd7116f6: Merge "Group CtsVerifier Tests into Categories" into froyo

Merge commit 'bd7116f6d8917718675b670e41a7e6d76cf67f1c' into froyo

* commit 'bd7116f6d8917718675b670e41a7e6d76cf67f1c':
  Group CtsVerifier Tests into Categories