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

Merge commit 'ce881e85d5624c0b562ebcf4d13bb80837ae1661' into gingerbread-plus-aosp

* commit 'ce881e85d5624c0b562ebcf4d13bb80837ae1661':
  Group CtsVerifier Tests into Categories