Merge remote-tracking branch 'asoc/topic/dapm' into asoc-core