does not work, but perhaps less broke
Merge branch 'android/fixing_audio' into develop