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

Change-Id: I8cdf2c40445b5ec21eb0d1e90032a80287ffbd3d