Merge "Reland "Migrate init.environ.rc module to Soong"" into main