Well, at least this PR does what it intends to: fix the other PR that made sound not work anymore on Android.