Merge "Remove stale files from the NDK directory."