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

* commit '38ae6989a72ccdb7e8bb5b0ac99943543abd4883':
  Fix AudioEngine to allow re-initialization - DO NOT MERGE