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

Change-Id: I7eedbf6562f81732a631cbc5368d46c22bd0697f