Empty line with comment eats trailing nl token

 * Without grabbing the rest of the sol tokens.

Bug: 66686
Change-Id: I80eb633594d18c9a94c5727fd3ae169b968bd633