Merge "Rename repo_diff_android.py workspace directories"