Merge "Temporary hack to avoid stack protector crashes."
am: 32388ba4dc

* commit '32388ba4dc765619e89dac5b71a68372019da58e':
  Temporary hack to avoid stack protector crashes.