Merge "asoc: fix compilation issue"