Revert "Shamu: Potential fix for audio"

This reverts commit 916ed81099d5536b94d4342ba67889a219b47ec9.

Change-Id: Ideba2a9113b02757ab496de05e29ebed61d0a9fb