Merge "Srtp: Turn off unused-but-set-variable warning"