Update to 7.0

Change-Id: I621cc47352f7ac552d9602485825ae3a6f9ae516
diff --git a/minadbd/Android.mk b/minadbd/Android.mk
index 36e14a5..2bfe119 100644
--- a/minadbd/Android.mk
+++ b/minadbd/Android.mk
@@ -14,14 +14,15 @@
     adb_main.cpp \
     fuse_adb_provider.cpp \
     services.cpp \
-    ../fuse_sideload.c
+    ../fuse_sideload.cpp
 
+LOCAL_CLANG := true
 LOCAL_MODULE := libminadbd
 LOCAL_CFLAGS := $(minadbd_cflags)
 LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. system/core/adb
 LOCAL_WHOLE_STATIC_LIBRARIES := libadbd
-LOCAL_SHARED_LIBRARIES := libbase liblog libmincrypttwrp libcutils libc
+LOCAL_SHARED_LIBRARIES := libbase liblog libcutils libc libcrypto
 
 include $(BUILD_SHARED_LIBRARY)