Apply consistent indenting and cleanup for cmake files.
Correct ->AddVal(...) indentation.
Four space indentation for cmake files.
Merge branch 'rakhimov-google_style' into develop