Merge "Fix clang-tidy warnings in soundtrigger."
am: 3ba2cb78bf

Change-Id: Ib9481a6bb666c75b8c0c1db5fc8f480cc85a266a