Merge "Enable Scudo for mediaextractor"