Merge \"Updates to the sound trigger test app\" into nyc-mr1-dev
am: e1fdcc49fd

Change-Id: I84028121d101f417e2c55450b2a95041f33d2d40