Merge "Fixing a couple crashes in the SoundTriggerTestApp" into pi-dev am: 67890e0e1d
am: bbea1f436f

Change-Id: I4899434b32a6f2685fdbfe3d25a854917832f25d