Remove unnecessary imports

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
metatype annotations: Don't export them, just include them

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
metatype annotations: Add to bnd.jar

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
Merge pull request #638 from bjhargrave/631-updates

Updates to the changes for OSGi Metatype annotations support