Fix CppCodeGen build breaks
Fix CppCodeGen build breaks

shrah/corert,sandreenko/corert,botaberg/corert,tijoytom/corert,gregkalapos/corert,krytarowski/corert,shrah/corert,gregkalapos/corert,yizhang82/corert,tijoytom/corert,krytarowski/corert,krytarowski/corert,tijoytom/corert,gregkalapos/corert,yizhang82/corert,shrah/corert,shrah/corert,tijoytom/corert,krytarowski/corert,botaberg/corert,botaberg/corert,sandreenko/corert,yizhang82/corert,gregkalapos/corert,yizhang82/corert,botaberg/corert,sandreenko/corert,sandreenko/corert