Merge "Add back doc-comment-check-docs back to checkbuild." am: cb61d10c90
am: 8ca3397939

Change-Id: I6cf5079067dceac0a994cc0378bde7b1e72eb268