Merge "Add -lpthread -ldl to link executable/tests"