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

Change-Id: Ic7e20f1f58c4593d70e1543dd800d58ae74e00c4