Don't wrap comment in a span tag. Hack class/library comments to have right line spacing

R=efortuna@google.com

Review URL: https://chromiumcodereview.appspot.com//60943004