CMake build out of sync/broken since ee674323 landed. Change-Id: Ica3186db2e8b80750069f224f5b5858491e5be0b