More fix with linaro strict aliasing

Change-Id: I8491da42f1f74139041b313555f78f096d512c0e