Merge changes I56d4f852,I8c81dc1f

* changes:
  Find make goals from lsdump_paths.txt
  Always collect lsdump paths from lsdump_paths.txt