Merge "Set PLATFORM=vpp for all 'make -C build-root/Makefile'"