tree 4f88a3b47e079770ea1d8983c69d0e373a69f5dc
parent 09f03a0c28bc5de1068c0ca8f6d1afc7c2cd902a
parent fe95eab5d6bce2f67ad44cb402c32542b1bd4a29
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1632450827 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1632450827 +0000

Merge cherrypicks of [1836035, 1836036, 1836037, 1835944, 1835945, 1836015] into ndk-release-r23

Change-Id: Ib056b0151d26df413ce0d36f12befb7ffd55ded3