Merge "Reland "Move to NDK r21.""