Back port the annotations support lib to mr1. do not merge.

Change-Id: I557354e2f95126680981e75ddebc28764825d02a
3 files changed