s4-common: update audio_policy from CAF upstream

Change-Id: Iaeb17578c9ac4b40eb7be0b2cdd2366309fdf1e6
Merge branch 'cm' into HEAD