tree 3d85e5f4b7a5a2dd3ba0f763c1c83c076034f4e1
parent a575b3396573e92d5b20ce3ff2431cd6b9eb7529
parent 63eddab9ab0fb281fef8953d93e2f11ca40debe5
author android-build-prod (mdb) <android-build-team-robot@google.com> 1588789319 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> 1588789319 +0000

Merge cherrypicks of [1304374, 1304375, 1304376, 1304377, 1304378, 1304379, 1304380, 1304381, 1304382, 1304383, 1304384, 1304385, 1304453, 1304454, 1304473] into ndk-release-r21

Change-Id: I9dbf684e5d8f1c08bb8598528286eeaa7bf24bf1