Merge "Use --sysroot when compiling against the NDK" into main am: 7edeaad1a5

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

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