Fix partial formatting of lines with trailing comments

Previously the replacements ended at the beginning of any trailing
whitespace/comments, which caused whitespace/comments to get pushed to the next
line.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=95548588