Move EDI to InfoStore

Change-Id: I35e81591a415aff643bac43c98f4c25ccfe1bc79
diff --git a/build/device_info_package.mk b/build/device_info_package.mk
index 1f4d350..0ccb05d 100644
--- a/build/device_info_package.mk
+++ b/build/device_info_package.mk
@@ -46,7 +46,7 @@
 endif
 
 # Add the base device info
-LOCAL_STATIC_JAVA_LIBRARIES += compatibility-device-info
+LOCAL_STATIC_JAVA_LIBRARIES += compatibility-device-info compatibility-device-util
 
 # Generator of APK manifests.
 MANIFEST_GENERATOR_JAR := $(HOST_OUT_JAVA_LIBRARIES)/compatibility-manifest-generator.jar