Merge "enable -fstack-protector-strong" am: 2a49aba35b
am: c5c2e60707

* commit 'c5c2e60707cb1b5623705a78724e27efdf3cb7d5':
  enable -fstack-protector-strong