Clean up Android codebase