am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.

Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2

* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
  Change name of CTS DeviceInfoCollector package to TestDeviceSetup.