Merge "Remove -fno-strict-aliasing flag"