Merge "Remove unnecessary lib dependencies in the FL makefile"