Merge changes from topic "ndk-update" am: 5c4e5046c8 am: 614ec4b4fb am: 418c0eed2f am: cb43a2c210

Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2043224

Change-Id: I36f0dc4942f825eeaadb86379f041f00842d3e29
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <[email protected]>