Merge "Fix build error in stub soundtrigger HAL" into nyc-dev