changes from CM's audio-caf

Change-Id: I065d2e13d4dab1c305408cfcc131ec585240952c