Merge "BuildSystem: Remove orphaned .PHONY targets."