Also update C++ and C functions from generator script output. Change-Id: I55ce71c609ba5f5811db2ae78786ab7013a04b69