Remove merge error in cm_arrays comment block

* Also fix the copyright header spacing

Change-Id: Ic9a795647392dd657b13362a8d0ffa3ac832c512
(cherry picked from commit c30b32bf2817d40a11f53f09014cbd6a4bcbe745)