I think worrying about trailing spaces is a complete waste of time, and we should instead remove the checkstyle rule. We've explicitly decided to ignore them in google3 Java, and I don't see why it should be any different here.