resolved conflicts for merge of 9df68a13 to mnc-dev-plus-aosp

Change-Id: I5c72c27ec055195d84c58d0699b46d3942c29dde

diff --cc Android.mk
Simple merge

diff --cc CommandListener.cpp
index 11eec02,696e37d..321074f
--- 1/CommandListener.cpp
--- 2/CommandListener.cpp
+++ b/CommandListener.cpp
@@@ -39,9 -38,9 +39,10 @@@
  #include "Process.h"
  #include "Loop.h"
  #include "Devmapper.h"
+ #include "Ext4Crypt.h"
  #include "cryptfs.h"
  #include "fstrim.h"
 +#include "MoveTask.h"
  
  #define DUMP_ARGS 0