Add additional paths also in library discovery phase

This tries to avoid bundled libraries shadowing other includes

Author: facchinm

legacy/builder/container_find_includes.go

@@ -318,6 +318,11 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
 		if library, ok := sourceFile.Origin.(*libraries.Library); ok && library.UtilityDir != nil {
 			includes = append(includes, library.UtilityDir)
 		}
+		if library, ok := sourceFile.Origin.(*libraries.Library); ok && library.AdditionalIncludePaths != nil {
+			for _, el := range library.AdditionalIncludePaths {
+				includes = append(includes, el)
+			}
+		}
 		var preproc_err error
 		var preproc_stderr []byte
 		if unchanged && cache.valid {