CMake cleanups.

Change-Id: I177c856eb06e8fb2847a0d483114198a2a0a5dae
3 files changed