DeviceInfoActivity for CTSv2

Renamed DeviceInfoActivity to DeviceInfo. DeviceInfo extends
InstrumentationTestCase and will run automatically by ctsv2.

Bug: 23488971
Change-Id: Ie991bbf9eac85b4af132b845779d330101b7000a
diff --git a/build/device_info_package.mk b/build/device_info_package.mk
index 0aaa8aa..85593d2 100644
--- a/build/device_info_package.mk
+++ b/build/device_info_package.mk
@@ -17,7 +17,7 @@
 #
 
 DEVICE_INFO_PACKAGE := com.android.compatibility.common.deviceinfo
-DEVICE_INFO_INSTRUMENT := com.android.compatibility.common.deviceinfo.DeviceInfoInstrument
+DEVICE_INFO_INSTRUMENT := android.support.test.runner.AndroidJUnitRunner
 DEVICE_INFO_PERMISSIONS += android.permission.WRITE_EXTERNAL_STORAGE
 DEVICE_INFO_ACTIVITIES += $(DEVICE_INFO_PACKAGE).GenericDeviceInfo $(DEVICE_INFO_PACKAGE).PackageDeviceInfo