tree 203bab400fdf4a1abbb0160cdedc0c14ed135f84
parent 43fa9e098bbbee7ed83204870c1e2060fd8af50f
parent a33654d7db381d53016d02ecccc5a5067f7f080b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1706664364 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1706664364 +0000

Merge cherrypicks of ['android-review.googlesource.com/2926058'] into ndk-r26-release.

Change-Id: I11f2d5f210a0fc83d7e5bed3c89bcaa9bc639899