Merge "af-binder: Add C++ feature to genskel"