Adapt to new cmake enum and marshal generators

Change-Id: I05b93fd2ad4d1b0803d338b5026d1e0be26ec7a0