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

Change-Id: Ic8f6b995dcf0362d8ac182a10cb15dbbc9d769e8