This patch increases unity-build opportunities.
Currently, the source files that have properties are simply excluded, even if
they have the same properties.
Here, I apply unity builds to the source file that can be bundled
together.