Merge "Add aninja to envsetup.sh" into main am: 66a01781 am: 6a2f7b0c

Original change: https://android-review.googlesource.com/c/platform/build/+/2802293



Change-Id: I1b99be4a17026dc680056c2ed55e00db68a81648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>