resolved conflicts for merge of e206e7c9 to jb-mr1-dev-plus-aosp

Change-Id: I52fcfbdeb6bbb39c5330ce2be589ec546805aa1f

diff --cc vm/native/dalvik_system_Zygote.cpp
index 7c0eaa2,d441d29..f893889
--- 1/vm/native/dalvik_system_Zygote.cpp
--- 2/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@@ -29,13 -29,8 +29,14 @@@
  #include <errno.h>
  #include <paths.h>
  #include <sys/personality.h>
 +#include <sys/stat.h>
 +#include <sys/mount.h>
 +#include <linux/fs.h>
 +#include <cutils/fs.h>
  #include <cutils/sched_policy.h>
 +#include <cutils/multiuser.h>
 +#include <sched.h>
+ #include <sys/utsname.h>
  
  #if defined(HAVE_PRCTL)
  # include <sys/prctl.h>