Merge "Revert "Use --sysroot when compiling against the NDK"" into main am: d2a6f31579

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

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