tree 917764d34f19313ab864ca758b714a1767ff2e7a
parent 223d393ce54a9e20b71e26bdee89fe1365685ee9
parent 9bc4ada44eada0f82758a77d79fbb0a14f6d2a6b
author Dan Albert <danalbert@google.com> 1579900522 -0800
committer android-build-merger <android-build-merger@google.com> 1579900522 -0800

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

Change-Id: I8afddc385d758c1097fbe70b461aed4a60253e2a