Don't make annotated fields into providers.

Annotations probably need to apply to the actual type (e.g. string qualifiers).

Also fix build file deleting the manifest too aggressively.

Change-Id: If2e7d8d9bf68efddfbbf5718146bd1f6158f2db5