am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."

* commit '2d215e38c02828c1f10ccdb205011025c4172cb6':
  Use libcompiler_rt-extras on the host too.