Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev am: 59a66b8601
am: b0bb373286

Change-Id: I859b99e3dc68396abccc0f399004860042d6cb07