alsa_sound: Additional updates for MR2

Change-Id: I32b5c69be594d4e46f8d3040500f4cd0a31895db
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2