Update for j2objc 0.9.5 + other improvements

The change for productType = "com.apple.product-type.bundle.ocunit-test"; was automatic and seems to be innocuous.