Merge change I064ac356

* changes:
  Only put .o files into static libraries when building for the host.