Adapt to new cmake enum and marshal generators

Change-Id: Ie47133744ac697c829ed59f7e82612462107bd36