fixing a bunch of @Annotation references, to silence some droiddoc warnings.

Change-Id: I810faa6dc25392fc6ec9569876878fe9ac5e6603