Fix C++11 and strict-aliasing

Change-Id: I7043e1f9bb1eab8eaba3942e69144947539f6fbe