Merge "Fix scudo MTE tests."