Merge "Fix names in Codec2 VTS" into qt-dev am: 24573856be am: cefdaf6690
am: b2a92843f3

Change-Id: I20f77a9bb93433ba59a28d9a471ebd78854b931b