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

Change-Id: Ie75cb566dcc7fbf6b7b2de172a1376f180e0089f