Updates to the changes for OSGi Metatype annotations support

This updates the work from #631. It adds the metatype annotations to bnd and also does not export the annotations. bndtools will need https://github.com/bndtools/bndtools/pull/913 to work properly with this PR since this PR will stop bndlib from exporting the metatype annotations package.