reconcile froyo CTS variants

Change-Id: I3500118d665df5045d800d2e1d70107b47b52baf
tree: 3195f4f6eaf84495b7ed8b2c498b937f15eee6fa
  1. tests/