Rename targets for consistency with virtual-device

Bug: 346648287
Change-Id: I5413efa962e63ae105c5e5d2f1f3144be53b1cf7
1 file changed