Merge "Add aninja to envsetup.sh" into main