Merge "Disable Scudo's mismatch check for media_swcodec"