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