Merge changes I635cf82e,Iee3b4e0d into integration

* changes:
  Makefile: Fix ${FIP_NAME} to be rebuilt only when needed
  Makefile: Do not mark file targets as .PHONY target