Merge "Revert "device-tests: As a dependency to tests""