Fix Aliasing errors with strict compiling

Change-Id: I5fbbf042017456b48a3a3f8c31d8a36d81d2ce9d
Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	ping.c

Change-Id: Id000056c73f11240289864c67b068e19bc4ae9e7