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

Change-Id: I3e70f819afa35b0199b52c1008586f2d5607c14f