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

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

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