Revert tunnel decoding in favor of working audio effects

Change-Id: I0b5d24ef5c1db4eab0a84fca846bb86f01702508
Merge branch 'cm-11.0' into kk_mkt