Merge changes Ibfa6e5c2,I559afa9a

* changes:
  Stop declaring real files as phony
  Properly use implicit outputs