Merge "Fix some indentation errors in compiler driver"