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

Merge commit 'b4805a18e51d3a18caa2cac821479a9535778d58' into eclair-mr2-plus-aosp

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