Merge remote-tracking branch 'asoc/topic/sunxi' into asoc-next