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

Change-Id: I4a99588b14166eff428fdd8a3152e8e60244bd7d