Merge "Format CMakeLists.txt" am: 7f59ad624c am: c017c471e6
am: ce08843ca4

Change-Id: Ifce97cda51b88ad8a4a6dd77814560579edac7b8