Merge "Generate external annotations for the annotations library" into nyc-mr1-dev
am: 3ae4bf026c

Change-Id: I4f10a65544d02c7e4f7356d65d20f95c13441fd5