usbaudio: Merge with upstream

Change-Id: I4c06b1ea790bf2a632974c3f2f84a20aa08159f7