Merge changes Icd5f39ae,I2a4e956c

* changes:
  Make libutils test compile on the host
  Fix ODR issue in StrongPointer_test.cpp