tree 917764d34f19313ab864ca758b714a1767ff2e7a
parent 7651bf475837206792689e95e0027f869c1732d6
parent 8d899d5b8eef2486612f08b625560372a58d8a2b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579900894 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579900894 +0000

Merge "Reland "Move to NDK r21."" am: 9bc4ada44e am: 8d899d5b8e

Change-Id: Ibaaec844b291cd1b0745f5a0d5e899b28ecb9f94