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

Change-Id: I3ad1cac2566d3bc2a2cc0df0ba7d233b8447e0e7