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

Change-Id: I38e80b45290e9928a229353952a65cf694232b3c