resolved conflicts for merge of 87701e27 to lmp-mr1-dev-plus-aosp

Change-Id: Ie873baff626fe786515497f2e81aa9db2329168d

diff --cc Android.mk
index 05d75fa,d90b1c2..419fe5c
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -75,11 -79,19 +75,18 @@@ LOCAL_SRC_FILES := 
        $(common_src_files)
  
  LOCAL_C_INCLUDES := $(common_c_includes)
 -
  LOCAL_CFLAGS := -Werror=format
+ 
+ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
+ LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
+ common_shared_libraries += libcryptfs_hw
+ LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION
+ endif
+ 
  LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
 -
  LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
  
 +LOCAL_CXX_STL := libc++
  include $(BUILD_EXECUTABLE)
  
  include $(CLEAR_VARS)

diff --cc cryptfs.c
Simple merge