tree bcae22c18b04c66cc52e2f7747babd4b1ce0e14f
parent fee87102b39df181bb2269a526f9cd353448e4e9
parent 862f3664525df0ff9d255e1223d559c4d7e307ad
author android-build-prod (mdb) <android-build-team-robot@google.com> 1590517757 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1590517757 +0000

Merge cherrypicks of [1317624, 1317625, 1317626, 1317627, 1316664] into ndk-release-r21

Change-Id: I8f4d77d7d420c339da04c571ae1782078ff90737