Merge "Audio policy manager changes for audio effects" into gingerbread