Merge "Add buf_ans.h to the Makefile." into nextgenv2