am 35a502e8: am 421d4546: Merge "Set -fno-strict-aliasing here so we can get rid of it globally"

* commit '35a502e8113941909de9514fde32c51ad1d949ac':
  Set -fno-strict-aliasing here so we can get rid of it globally