Merge "Fix the build when using findleaves.py"