Merge change I006c279b

* changes:
  Remove broken .so and fix bogus test.