Updating the CMake generator. am: 5859799ce6
am: 9189fba3ec

Change-Id: I7d8a2ee79a119daa173e0165323dedd0fe5ca614