[Android] Misc cleanup.

Just small cleanups.