ALSA 1.0.25 USB merge

Change-Id: I6d1b7364a0c21c0fd40b4f707f50f1b5c2be74d6