[Android] Various cleanup

Self-explanatory