Remove merge error in cm_arrays comment block

* Also fix the copyright header spacing

Change-Id: Ic9a795647392dd657b13362a8d0ffa3ac832c512
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0