Merge "Give x permission on apex data directories." am: d6289bdf13 am: f29bb3a0ce

Change-Id: I5a9ac45b72e1e84f859d497d08a7e862b8fb3b13
diff --git a/init/builtins.cpp b/init/builtins.cpp
index adcba3a..c877590 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1276,7 +1276,7 @@
         if (strchr(name, '@') != nullptr) continue;
 
         auto path = "/data/misc/apexdata/" + std::string(name);
-        auto options = MkdirOptions{path, 0770, AID_ROOT, AID_SYSTEM, FscryptAction::kNone, "ref"};
+        auto options = MkdirOptions{path, 0771, AID_ROOT, AID_SYSTEM, FscryptAction::kNone, "ref"};
         make_dir_with_options(options);
     }
     return {};
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0d6c189..0b89909 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -593,7 +593,7 @@
     mkdir /data/misc/profman 0770 system shell
     mkdir /data/misc/gcov 0770 root root
     mkdir /data/misc/installd 0700 root root
-    mkdir /data/misc/apexdata 0700 root root
+    mkdir /data/misc/apexdata 0711 root root
     mkdir /data/misc/apexrollback 0700 root root
 
     mkdir /data/preloads 0775 system system encryption=None