Merge "[TC/gengrid] Fixed gengrid TC makefile"