Merge pull request #196 from ddunbar/rdar35319783

[BuildSystem] Don't propagate cancel state through phony commands.