Merge "Use platform prebuilts from NDK r23 canary" am: f07ecd3813 am: 40eca594b8 am: 7edbabee9f

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

Change-Id: I278f08c038930feb10d1f700e9bbf2731e266d98