tree f2be99c3696480ebf9112b27a3622cad3f0b4be2
parent e28d79a496052942d698b2080e8f6332ed1e8dd9
parent 48c960e0b3ee0929239e2131f5f996482b9e111a
author android-build-prod (mdb) <android-build-team-robot@google.com> 1614038933 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1614038933 +0000

Merge cherrypicks of [1600733, 1600734, 1600735, 1600736, 1600737, 1600738, 1600674, 1600675, 1600455, 1600456] into ndk-release-r22

Change-Id: Ifd75a85cc439aef9fb9426e077ec0d9f756c049d