Android: Cleanup after the last few commits.