Remove AnnotationAccess and its remaining uses.
am: 0830532

* commit '08305325d3468d5ef413eb0b36b1ea1b3746a6c4':
  Remove AnnotationAccess and its remaining uses.

Change-Id: Ic66ac22c300d6e372e15d1f8e6ee329a24f44844