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

Change-Id: If587cb89f94a3c56c0c3c1c814a5846b9cdbc2f0