Merge changes from topic "audio-hal-vsid" into pi-dev am: 2e09fa6efd
am: 8d31bc8f0e

Change-Id: I5f950a3579b0c8a4968594863dc5ab2123570e2a