Merge changes I2ae26513,Iddf3993c,I94bc5994 am: c788e51725 am: cd2360673f am: b24b5850aa am: ab760f6b19 am: 76be75f969

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

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