[HACK] Adding e4crypt support

This is a dirty hack requiring a lot of clean up.
Needed to allow other parts to make progress.

Add e4crypt functions to libext4_utils
Add e4crypt command line tool

Change-Id: Iac5ae75e7f39cccc87701faf1f590e44f5209c0e
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index c5684f9..964f666 100644
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -52,23 +52,29 @@
 # -- All host/targets excluding windows
 #
 
+libext4_utils_src_files += \
+    ext4_crypt.cpp \
+    e4crypt_static.c
+
 ifneq ($(HOST_OS),windows)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(libext4_utils_src_files)
 LOCAL_MODULE := libext4_utils
+LOCAL_C_INCLUDES += system/core/logwrapper/include
 LOCAL_SHARED_LIBRARIES := \
     libselinux \
     libsparse \
-    libz
+    libz \
+    libcutils
 include $(BUILD_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(libext4_utils_src_files)
+LOCAL_SRC_FILES := $(libext4_utils_src_files) \
+    ext4_crypt_init_extensions.cpp
 LOCAL_MODULE := libext4_utils_static
-LOCAL_STATIC_LIBRARIES += \
-    libselinux \
+LOCAL_STATIC_LIBRARIES := \
     libsparse_static
 include $(BUILD_STATIC_LIBRARY)
 
@@ -143,4 +149,3 @@
 include $(BUILD_PREBUILT)
 
 endif
-