Merge "Properly tolerate missing declaring source files"