Audio fix from upstream CM11

Change-Id: I3e5ff385cf3b1431b368dca5ca88018d89e35fcf