Fix/update android dri mcp tool prefix, Fixes AB#3601970

[somalaya]

In my previous PR, I merged the android dri mcp tool but a lot of references in the code were still pointing to older mcp tool names. In this PR, I have modified all the references.

Fixes AB#3601970

[github-actions]

❌ Work item link check failed. Description does not contain AB#{ID}.

Click here to Learn more.

[github-actions]

✅ Work item link check complete. Description contains link AB#3601970 to an Azure Boards work item.

[github-actions]

❌ Work item link check failed. Description contains AB#3601970 but the Bot could not link it to an Azure Boards work item.

Click here to learn more.

[richardtz12]

Hey Sowmya, why did the naming convention go from s2 -> s? Why was the previous naming convention named "s2"?

[somalaya]

Hey Sowmya, why did the naming convention go from s2 -> s? Why was the previous naming convention named "s2"?

The prefix is auto-generated by VS Code — it truncates the MCP server key name from mcp.json to create tool prefixes. Previously the server was registered under a different key name (e.g. android-dri-search2 or similar) which produced the mcp_android-dri-s2_* prefix.