Audio fix?

Change-Id: I7fd7d1910cfe9c5541a30e2a26cbfc33bb8c93c4
Merge branch 'cm-10.2' of https://github.com/Evisceration/android_device_generic_goldfish into cm-10.2

Conflicts:
	audio/audio_hw.c

Change-Id: Ia8de246ab36f41da796aa6efe46aa925a44c4919