Merge changes from topic "audio-hal-v4" into pi-dev
am: 14dc815cdc

Change-Id: Id2d9a430b686eb1fc947662c66a0a8d6f4a3223c