Fix indentation in various files

Change-Id: Ib442c919c46f5ec0176de46e10f0d51a2aa94afe