am c736dbcf: (-s ours) am e4dbcf35: am cf4d2a64: am 38ae6989: (-s ours) am ce2b95ae: Fix AudioEngine to allow re-initialization - DO NOT MERGE * commit 'c736dbcf': Fix AudioEngine to allow re-initialization - DO NOT MERGE