Merge pull request #5970 from JosJuice/android-trailing-spaces Remove trailing spaces from Android files