Handle change to annotation generation from docgen gracefully, clean up in general

BUG=
R=sethladd@google.com

Review URL: https://codereview.chromium.org//746183003