Merge "Adapt to rearranged NDK sysroot." am: 40472c23 am: 166753a9 am: a0a725c1

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



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