Link against libshill-client library.

We had a copy of the generated headers since the tools to generate them
were not ready at the time. This cleanup CL now uses the libshill-client
target to generate these headers.

Bug: None
Test: mmma system/update_engine

Change-Id: I4fe7c418c739349eadfd8d65213850dbdbebd6ca
diff --git a/Android.mk b/Android.mk
index 9755896..45fa10f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -97,10 +97,12 @@
 LOCAL_MODULE := libupdate_engine
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_C_INCLUDES += \
-    external/e2fsprogs/lib \
-    $(LOCAL_PATH)/include
+    $(LOCAL_PATH)/include \
+    external/cros/system_api/dbus \
+    external/e2fsprogs/lib
 LOCAL_EXPORT_C_INCLUDE_DIRS += \
-    $(LOCAL_PATH)/include
+    $(LOCAL_PATH)/include \
+    external/cros/system_api/dbus
 LOCAL_STATIC_LIBRARIES += \
     update_metadata-protos \
     update_engine-dbus-adaptor \
@@ -115,6 +117,7 @@
     libcrypto \
     libcurl \
     libmetrics \
+    libshill-client \
     libssl \
     libexpat \
     libchromeos-policy \
@@ -205,6 +208,7 @@
     libcrypto \
     libcurl \
     libmetrics \
+    libshill-client \
     libssl \
     libexpat \
     libchromeos-policy \
@@ -253,6 +257,7 @@
     libcrypto \
     libcurl \
     libmetrics \
+    libshill-client \
     libssl \
     libexpat \
     libchromeos-policy \
@@ -305,6 +310,7 @@
     libcrypto \
     libcurl \
     libmetrics \
+    libshill-client \
     libssl \
     libexpat \
     libchromeos-policy \