Integrate I/O performance data collection module with CarWatchdog main.

Bug: 148486340, 130382110
Test: Build worked for hawk/osprey.
Change-Id: Ibea3481e639eae37e4aca6e6371e6340c9e95856
diff --git a/watchdog/server/Android.bp b/watchdog/server/Android.bp
index 735c46c..72ebd00 100644
--- a/watchdog/server/Android.bp
+++ b/watchdog/server/Android.bp
@@ -36,6 +36,9 @@
         "libprocessgroup",
         "libutils",
     ],
+    static_libs: [
+        "libgtest_prod",
+    ],
 }
 
 cc_library {
@@ -51,9 +54,6 @@
         "src/ProcStat.cpp",
         "src/UidIoStats.cpp",
     ],
-    static_libs: [
-        "libgtest_prod",
-    ],
     export_include_dirs: [
         "src",
     ],
@@ -108,6 +108,7 @@
     defaults: [
         "carwatchdogd_defaults",
         "libwatchdog_process_service_defaults",
+        "libwatchdog_ioperfcollection_defaults",
     ],
     srcs: [
         "src/main.cpp",
@@ -116,5 +117,6 @@
     init_rc: ["carwatchdogd.rc"],
     shared_libs: [
     	"libwatchdog_process_service",
+        "libwatchdog_ioperfcollection",
     ],
 }