Merge change I7b302183

* changes:
  Remove cruft in the default libdvm.so and add 3 more special targets.