Merge "Revert "Revert "device-tests: As a dependency to tests""" am: ba0ebe9230
am: d46e933f1d

Change-Id: I48175dac2a6d76b93079c387cf900419a09b48d6