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

Change-Id: Ife12bf3e2b664c6f8388d2cd2313eb7d5438b9f4