Merge "hal: re-route VOIP TX path for enabling correct VOIP EC port"