Merge changes I2ae26513,Iddf3993c,I94bc5994 am: c788e51725

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

Change-Id: I2da1e5d3f715bb09348b8ccc8826dfb93e630da1
Signed-off-by: Automerger Merge Worker <[email protected]>