Fix aliasing violation

Change-Id: I481184c0af37eb495e9cbf0e2130b050062d08ad
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Merge branch 'linaro' into HEAD