[Android] Misc cleanup.