overlay changes for qcril

Change-Id: Ia05992d09ae78a7c482c72fadfa3bb357e391c11
Merge "overlay changes for qcril" into cm-11.0
Revert tunnel decoding in favor of working audio effects

Change-Id: I0b5d24ef5c1db4eab0a84fca846bb86f01702508
Merge branch "cm-11.0" into kylin