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

Change-Id: Ia6c762a7390317fa53fdd20e0fcd8037e4b255c5