am a2794979: Merge "Get rid of as much of dalvik.annotation.* as we can."

* commit 'a279497915012a19196e64e7c3126bcae65ff871':
  Get rid of as much of dalvik.annotation.* as we can.