Merge "Export init.environ.rc in early-init instead of init" am: acfb705603
am: 8f442d5efa

Change-Id: I39ac552182522b63db5eaa83b99b4fcce5218315