galaxys2-common: audio: fix merge fail

Change-Id: Icfdbe362c9dff887c96e5d65ecc94cca7bccd227
Merge branch 'cm-10.1' into martincz