Audio fix

Change-Id: I01d719f6024eae348f3c3b20abeaddfa7575e526
audio fix #2

Change-Id: I6ec16154221c0bf9a366b6dce7d43017cb2407c2
audio fix #3

Change-Id: Iaaca84e9962437998f9f270e1ff65172ec5d1708
Merge pull request #4 from jied83/jellybean

Good job.