am bdd65f5e: (-s ours) am 38ae6989: am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE

* commit 'bdd65f5e49719431e35398738b81e6d9feb05eb7':