simple code format fixes on the path towards spotless
These are some code format fixes that spotless can easily automatically manage, and should be compatible with the existing CI and Android Studio defaults. I'd like to get this merged ASAP to avoid dealing with merge conflicts. If anything is controversial here, I can remove it from this MR.