Merge changes from topic "fvpr_cleanup" into integration

* changes:
  refactor(tbbr): remove "fvp_r" platform specific check
  refactor(Makefile): move NEED_<IMAGE> before their use