New client entity definition for zombie_villager_v2 has the wrong file name, making the compiled Bedrock samples misleading

The 1.21.70.24 Preview replaced the client entity definitions for all entities that have spawn eggs. The new definition for the zombie_villager_v2 client entity has been put into a file named zombie_villager.entity.json instead of zombie_villager_v2.entity.json. This causes the contents of each file in the compiled Bedrock samples to be incorrect.

Steps to reproduce

1. On a PC with Minecraft Preview installed, navigate to C:\Program Files\WindowsApps\Microsoft.MinecraftWindowsBeta_1.21.7025.0_x64__8wekyb3d8bbwe\data\resource_packs\vanilla_1.21.70\entity

2. Open the zombie_villager.entity.json file. Note that it contains the definition for zombie_villager_v2 entity.

3. Download the Bedrock samples for 1.21.70.23, and 1.21.70.24 or .25 from https://github.com/Mojang/bedrock-samples/releases

4. Compare the following files between the downloaded archives
   \resource_pack\entity\zombie_villager.entity.json
   \resource_pack\entity\zombie_villager_v2.entity.json

Expected result

• The zombie_villager_v2 entity would be defined in zombie_villager_v2.entity.json.

• The Bedrock samples would contain the current valid definition for each entity and would be consistent across versions.

Observed result

(Step (2)) the zombie_villager_v2 entity is defined in zombie_villager.entity.json. As a result (Step (4)):

• The 1.21.70.24 and .25 Bedrock samples contain the current zombie_villager_v2 definition in zombie_villager.entity.json.

• The contents of zombie_villager_entity.json from the 1.21.70.23 Bedrock samples cannot be found in the 1.21.70.24 and .25 Bedrock samples.

• The contents of zombie_villager_v2.entity.json in the Bedrock samples for 1.21.70.24 and .25 are identical to zombie_villager_v2 from 1.21.70.23.