Update the fix for uninitialized memory accesses in FLANN for master

Namely, replace the workaround from #1392 with upstream's solution.