Merge "Fix some indentation errors in compiler driver" am: d58932f98a
am: 9e35aa63b7

Change-Id: If0742d37ba4b17d724c036f00ccf1cdc4263e176