DO NOT MERGE Merge Eclair CTS Changes into Froyo

Changes to branches beyond Froyo will be done separately to avoid
further merge conflicts.

Change-Id: I157c687fa059f9505f5cf62b6d1348b0411bca1c
tree: 7ecab3ccbbd428d624b8d6a0752fb4fa272ceb4f
  1. tests/