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

Change-Id: I705538beb82101389dfaed4b1218e6b8e330c2a5