Adapt to new cmake enum and marshall generators

Change-Id: Ib4fcfd0f4397e1ca6bae3f6dd55dae8fc2a18e94