Fix cts-tradefed unit tests.

Change-Id: Iaad20b3ac6d02013ebd8a537af7b46abfdaed1a7
5 files changed