Merge "Refactor SoundEffectsHelper for asynchronous loading"
am: 70532e5231

Change-Id: Ic0a89d216ff2fde1a63a748b102b286e6d143a36