am 2c83b090: am d5096c6a: resolved conflicts for merge of 5c903372 to jb-mr1-dev
am 2c83b090: am d5096c6a: resolved conflicts for merge of 5c903372 to jb-mr1-dev

* commit '2c83b09034d5be5369168697eab3e825ef13610d':
  Use gold linker on x86

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