Merge "Adapt to rearranged NDK sysroot." am: 40472c2371

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

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