Merge "Temporarily use -fstack-protector for the read barrier config."
am: caef579e90

* commit 'caef579e906abc5c3174ba65e5205ea7fd5c44ad':
  Temporarily use -fstack-protector for the read barrier config.