Merge Thrift interface with libclang - part 2