Merge "Update NDK platform prebuilts to build 6279347." into ndk-release-r21