Android: remove unnecessary abstraction, rename things
Android: Formatting + imports