Merge "Revert "Move to NDK r21.""