fix android lint warnings

+ reformat code