Remove AnnotationAccess and its remaining uses. am: 0830532
am: f54591c

* commit 'f54591c43b51f794fa81d625e436fc20460172e0':
  Remove AnnotationAccess and its remaining uses.

Change-Id: I1b8a97d3e1a004d182e8b925022ca0b78f082537