resolved conflicts for merge of e678897f to klp-dev-plus-aosp

Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70

diff --cc cmds/installd/commands.c
index 84ad204,f68d758..e9d6b15
--- 1/cmds/installd/commands.c
--- 2/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@@ -184,7 -184,7 +184,7 @@@ int delete_user_data(const char *pkgnam
      return delete_dir_contents(pkgdir, 0, "lib");
  }
  
- int make_user_data(const char *pkgname, uid_t uid, userid_t userid)
 -int make_user_data(const char *pkgname, uid_t uid, uid_t persona, const char* seinfo)
++int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* seinfo)
  {
      char pkgdir[PKG_PATH_MAX];
      char applibdir[PKG_PATH_MAX];

diff --cc cmds/installd/installd.c
Simple merge

diff --cc cmds/installd/installd.h
index 635b07c,98e9f9f..9ca2f86
--- 1/cmds/installd/installd.h
--- 2/cmds/installd/installd.h
+++ b/cmds/installd/installd.h
@@@ -190,13 -193,13 +190,13 @@@ int ensure_media_user_dirs(userid_t use
  /* commands.c */
  
  int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo);
 -int uninstall(const char *pkgname, uid_t persona);
 +int uninstall(const char *pkgname, userid_t userid);
  int renamepkg(const char *oldpkgname, const char *newpkgname);
  int fix_uid(const char *pkgname, uid_t uid, gid_t gid);
 -int delete_user_data(const char *pkgname, uid_t persona);
 -int make_user_data(const char *pkgname, uid_t uid, uid_t persona, const char* seinfo);
 -int delete_persona(uid_t persona);
 -int delete_cache(const char *pkgname, uid_t persona);
 +int delete_user_data(const char *pkgname, userid_t userid);
- int make_user_data(const char *pkgname, uid_t uid, userid_t userid);
++int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* seinfo);
 +int delete_user(userid_t userid);
 +int delete_cache(const char *pkgname, userid_t userid);
  int move_dex(const char *src, const char *dst);
  int rm_dex(const char *path);
  int protect(char *pkgname, gid_t gid);