am c5da8557: Merge "Fix AudioEngine to allow re-initialization"

* commit 'c5da8557f1a26e984b14b9eb64cda2d3d3ba71ce':
  Fix AudioEngine to allow re-initialization