Merge "[UTC/ITC][capi-media-audio-io/capi-media-wav-player/capi-media-tone-player...

diff --cc src/itc/audio-io/ITs-audio-input.c
Simple merge

diff --cc src/itc/audio-io/ITs-audio-output.c
Simple merge

diff --cc src/itc/tone-player/ITs-tone-player.c
Simple merge

diff --cc src/itc/wav-player/ITs-wav-player.c
Simple merge

diff --cc src/utc/audio-io/utc-media-audio-input.c
Simple merge

diff --cc src/utc/audio-io/utc-media-audio-output.c
Simple merge

diff --cc src/utc/tone-player/utc-tone-player.c
Simple merge

diff --cc src/utc/wav-player/utc-wav-player.c
Simple merge