am 5630521a: resolved conflicts for merge of 3e91f5ad to jb-mr1-dev
am 5630521a: resolved conflicts for merge of 3e91f5ad to jb-mr1-dev

* commit '5630521aba12a03637e7328686924df4d298ff4d':
  Enable stack-protector for x86

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build