Merge "Revert "device-tests: As a dependency to tests""
am: 5b216025ba

Change-Id: I6305f1e4cb12d7af27a897812fe68934b1dc884b