Improve annotation handling.

Don't put nullability on primitives/void.
Reduce duplication of annotations

Test: Add tests
Change-Id: I3b78898a3757206578d66fd769d5bf2fd14dbaf6
131 files changed