Improve android migration logic and version clarity