Revert "Strict Aliasing Fix"

This reverts commit d42bf1d1d3b1b62dfe00a9f706466681fbc9c7ef.
Allow building when using strict aliasing

Change-Id: I748a8fefc246292888394a583c730f9d937230a2
More fixes to permit build with strict aliasing

Change-Id: If09ab1a882df4a51553676be52f1ca132a3784c8

fix