board_group_find_extra_libs(): Simplify and optimize watermark usage