Get rid of as much of dalvik.annotation.* as we can.

Some of it is public API (why oh why..) so we're forced to
keep it around.

Change-Id: Ic1e059d7162c442a1a996eb1510d0f7f84add34e
25 files changed