Merge "Revert "Frameworks/base: Refactor UserHandle and Environment a bit"" into nyc-mr1-dev

services/java/com/android/server/SystemServer.java

@@ -284,9 +284,6 @@ public final class SystemServer {
             // we've defined it before booting further.
             Build.ensureFingerprintProperty();
 
-            // Initialize Environment for the system user.
-            Environment.init();
-
             // Within the system server, it is an error to access Environment paths without
             // explicitly specifying a user.
             Environment.setUserRequired(true);