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

Change-Id: I30a95c806c6694ab3f17996001e0c9668cf2d8e5