cherry-pick bionic strict aliasing violation fix