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

Change-Id: Iceb0d847f381ede8bf5f426452ca197bb1c86fb7