am 60fd3fee: Migrate CA certificates to all users

* commit '60fd3feecab4336d964ca8e31c7c3220e1afb558':
  Migrate CA certificates to all users

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

diff --cc cmds/installd/utils.c
index ae9ba7f,e381aef..8f366a0
--- 1/cmds/installd/utils.c
--- 2/cmds/installd/utils.c
+++ b/cmds/installd/utils.c
@@@ -1015,10 -1114,11 +1113,10 @@@ int ensure_media_user_dirs(userid_t use
  
  int ensure_config_user_dirs(userid_t userid) {
      char config_user_path[PATH_MAX];
 -    char path[PATH_MAX];
  
      // writable by system, readable by any app within the same user
-     const int uid = (userid * AID_USER) + AID_SYSTEM;
-     const int gid = (userid * AID_USER) + AID_EVERYBODY;
+     const int uid = multiuser_get_uid(userid, AID_SYSTEM);
+     const int gid = multiuser_get_uid(userid, AID_EVERYBODY);
  
      // Ensure /data/misc/user/<userid> exists
      create_user_config_path(config_user_path, userid);