Don't count blocks as empty if they have comments in them

Bug: 63742
Change-Id: I62b303a3104101c9c80d95e1101ea22b4b0d2f95