Fix "Settings: Forward port ADB over network (Part 1 of 2)"
Signed-off-by: CNBLACK <didwjdgns21@gmail.com>
Remove merge error in aosd_arrays comment block
* Also fix the copyright header spacing

Change-Id: Ic9a795647392dd657b13362a8d0ffa3ac832c512
Signed-off-by: CNBLACK <didwjdgns21@gmail.com>