Merge "Revert to `-fstack-protector-strong` in read barrier config."
am: 6dde4d3274

Change-Id: I863e3e3e5f6d86266ac13741befafa2c1dc5e680