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