Merge "IAudioFlinger: fix incorrect audio patch handle" into sc-dev