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

Change-Id: I8afddc385d758c1097fbe70b461aed4a60253e2a