Merge "Move aninja and overrideflags from shell functions to real scripts" into main am: 6e2d36da

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



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