Merge "audio: update the vifeedback pcm device id"

#define INCALL_MUSIC_UPLINK_PCM_DEVICE 1

#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 16

#define SPKR_PROT_CALIB_RX_PCM_DEVICE 5

#define SPKR_PROT_CALIB_TX_PCM_DEVICE 22

#define SPKR_PROT_CALIB_TX_PCM_DEVICE 25

#define PLAYBACK_OFFLOAD_DEVICE 9

#define COMPRESS_VOIP_CALL_PCM_DEVICE 3