Updating the CMake generator.
am: 5859799ce6

Change-Id: I6c0d3d378d281345b722f3d60d468b08b7de20e7