Merge "Temporary hack to avoid stack protector crashes." am: 32388ba4dc
am: 316cc664ac  -s ours

* commit '316cc664acf54a9d76e9bb61f910e56de715b008':
  Temporary hack to avoid stack protector crashes.