Merge "Format CMakeLists.txt" am: e1f9fdafec am: 008187186f
am: 56335db9bb

Change-Id: Ie2f652103550f0ac0f502f05b21a96f7c85bcd2f