Remove trailing whitespace everywhere

Change-Id: I14f812bd31bd33d9fbd1148a474cbe7a3375d954
Merge "Remove trailing whitespace everywhere"