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

* commit '46d0b7d2b216e2acebd60f0c65d98f6880307c9c':