cherry-pick bionic aliasing violation fix

Change-Id: I7a425d0c1adfa6daafcd4c11b9df407f269cfb61