Merge "ASoc: fix compilation error"