Merge "Support AudioSystem interface change"